diff --git a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
index 2865f8eb93..8b71838f6a 100644
--- a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
+++ b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
@@ -27283,6 +27283,10 @@
icon_state = "bluedirtychess2"
},
/area/f13/building)
+"kXS" = (
+/obj/machinery/mineral/ore_redemption,
+/turf/open/floor/f13/wood,
+/area/f13/ncr)
"kYp" = (
/obj/structure/safe,
/obj/effect/spawner/lootdrop/f13/armor/tier3,
@@ -45986,6 +45990,13 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+"tch" = (
+/obj/machinery/mineral/ore_redemption,
+/turf/open/indestructible/ground/outside/dirt{
+ dir = 4;
+ icon_state = "dirt"
+ },
+/area/f13/wasteland)
"tci" = (
/obj/structure/table/wood/settler,
/obj/item/reagent_containers/food/snacks/f13/steak,
@@ -70261,7 +70272,7 @@ wvV
bAo
dlI
dlI
-dlR
+kXS
ehN
ubg
ehN
@@ -119314,7 +119325,7 @@ mvv
doX
cWG
cWG
-cWG
+tch
cWS
nvr
nvr
diff --git a/code/datums/components/crafting/recipes/recipes_primal.dm b/code/datums/components/crafting/recipes/recipes_primal.dm
index 73ae505228..0fdf493419 100644
--- a/code/datums/components/crafting/recipes/recipes_primal.dm
+++ b/code/datums/components/crafting/recipes/recipes_primal.dm
@@ -234,6 +234,19 @@
/obj/item/advanced_crafting_components/alloys = 1,
/obj/item/stack/sheet/glass = 4)
category = CAT_TRIBAL
+
+/datum/crafting_recipe/tribalwar/yumi
+ name = "Yumi"
+ result = /obj/item/gun/ballistic/bow/yumi
+ time = 360
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 10,
+ /obj/item/weaponcrafting/string = 6,
+ /obj/item/stack/sheet/mineral/bamboo = 30,
+ /obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/glass = 4,
+ /obj/item/stack/crafting/metalparts = 5)
+ category = CAT_TRIBAL
+ always_available = FALSE
//ARROWS
@@ -242,8 +255,7 @@
result = /obj/item/ammo_casing/caseless/arrow/burning
time = 30
reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1,
- /obj/item/reagent_containers/food/snacks/meat/slab/human/ghoul = 4)
+ /datum/reagent/fuel = 10)
category = CAT_TRIBAL
tools = list(TOOL_WORKBENCH)
@@ -273,7 +285,7 @@
time = 30
reqs = list(
/obj/item/ammo_casing/caseless/arrow = 1,
- /obj/item/reagent_containers/food/snacks/grown/nettle = 5,
+ /obj/item/reagent_containers/food/snacks/grown/feracactus = 1,
)
category = CAT_TRIBAL
tools = list(TOOL_WORKBENCH)
@@ -320,6 +332,19 @@
)
category = CAT_TRIBAL
tools = list(TOOL_WORKBENCH)
+
+/datum/crafting_recipe/tribalwar/arrowexplode
+ name = "Explosive Arrow"
+ result = /obj/item/ammo_casing/caseless/arrow/explosive
+ time = 15
+ reqs = list(
+ /obj/item/stack/rods = 1,
+ /obj/item/stack/crafting/goodparts = 2,
+ /obj/item/pressure_plate = 1,
+ /datum/reagent/blackpowder = 10
+ )
+ category = CAT_TRIBAL
+ tools = list(TOOL_WORKBENCH)
//MELEE
diff --git a/code/datums/components/crafting/recipes/recipes_tailoring.dm b/code/datums/components/crafting/recipes/recipes_tailoring.dm
index d02387c9e0..b21a37204e 100644
--- a/code/datums/components/crafting/recipes/recipes_tailoring.dm
+++ b/code/datums/components/crafting/recipes/recipes_tailoring.dm
@@ -121,6 +121,22 @@
category = CAT_CLOTHING
subcategory = CAT_ARMOR
+/datum/crafting_recipe/raiderpa
+ name = "Raider Power Armor"
+ result = /obj/item/clothing/suit/armor/f13/power_armor/raiderpa
+ reqs = list(/obj/item/clothing/suit/armor/f13/metalarmor = 1,
+ /obj/item/stack/crafting/armor_plate = 3,
+ /obj/item/crafting = 15,
+ /obj/item/ingot/gold = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 5,
+ /obj/item/stack/sheet/prewar = 20
+ )
+ tools = list(TOOL_WORKBENCH)
+ time = 600
+ category = CAT_CLOTHING
+ subcategory = CAT_ARMOR
+ always_available = FALSE
+
datum/crafting_recipe/steelbib
name = "Steel Breastplate"
result = /obj/item/clothing/suit/armor/f13/metalarmor/steelbib
@@ -534,6 +550,17 @@ datum/crafting_recipe/steelbib/heavy
category = CAT_CLOTHING
subcategory = CAT_ARMOR
+/datum/crafting_recipe/wastehound
+ name = "wastehound raider helmet"
+ result = /obj/item/clothing/head/helmet/f13/raider/wastehound
+ time = 120
+ reqs = list(/obj/item/stack/sheet/animalhide/human = 5,
+ /obj/item/stack/sheet/mineral/titanium = 5,
+ /obj/item/stack/sheet/cloth = 5)
+ category = CAT_CLOTHING
+ subcategory = CAT_ARMOR
+ always_available = FALSE
+
/datum/crafting_recipe/durathread_helmet
name = "Makeshift Durathread Helmet"
result = /obj/item/clothing/head/helmet/durathread
@@ -1069,22 +1096,6 @@ datum/crafting_recipe/steelbib/heavy
subcategory = CAT_MISCCLOTHING
/*
-/datum/crafting_recipe/durathread_vest
- name = "Makeshift Vest"
- result = /obj/item/clothing/suit/armor/vest/durathread
- reqs = list( /obj/item/stack/sheet/durathread = 5,
- /obj/item/stack/sheet/leather = 4)
- time = 50
- category = CAT_CLOTHING
- subcategory = CAT_GENCLOTHES
-/datum/crafting_recipe/durathread_helmet
- name = "Makeshift Helmet"
- result = /obj/item/clothing/head/helmet/durathread
- reqs = list( /obj/item/stack/sheet/durathread = 4,
- /obj/item/stack/sheet/leather = 5)
- time = 40
- category = CAT_CLOTHING
- subcategory = CAT_GENCLOTHES
/datum/crafting_recipe/fannypack
name = "Fannypack"
result = /obj/item/storage/belt/fannypack
diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
index 61781f3d20..3440e0e9f3 100644
--- a/code/game/objects/effects/spawners/f13lootdrop.dm
+++ b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -805,7 +805,6 @@ obj/effect/spawner/lootdrop/f13/medical/rnd/good
/obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/superlow
name = "very low tier non-hobo ballistic gun"
loot = list(/obj/effect/spawner/bundle/f13/ninemil,
- /obj/effect/spawner/bundle/f13/sig,
/obj/effect/spawner/bundle/f13/caravan_shotgun,
/obj/effect/spawner/bundle/f13/mosin,
/obj/effect/spawner/bundle/f13/remington,
@@ -2162,7 +2161,6 @@ obj/effect/spawner/lootdrop/f13/medical/rnd/good
lootcount = 1
lootdoubles = FALSE
loot = list(
- /obj/effect/spawner/bundle/f13/sig,
/obj/effect/spawner/bundle/f13/beretta,
/obj/effect/spawner/bundle/f13/ninemil
)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 0a0bd85bd2..da4e7e892b 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -838,6 +838,11 @@
name = "gauss rifle blueprint"
icon_state = "blueprint2"
crafting_recipe_types = list(/datum/crafting_recipe/gaussrifle)
+
+/obj/item/book/granter/crafting_recipe/blueprint/yumi
+ name = "yumi blueprint"
+ icon_state = "blueprint2"
+ crafting_recipe_types = list(/datum/crafting_recipe/tribalwar/yumi)
/obj/item/book/granter/crafting_recipe/manual/denvr
name = "den vr configuration"
diff --git a/code/game/objects/items/storage/survivalkit.dm b/code/game/objects/items/storage/survivalkit.dm
index a1544c6865..62c989f842 100644
--- a/code/game/objects/items/storage/survivalkit.dm
+++ b/code/game/objects/items/storage/survivalkit.dm
@@ -75,8 +75,52 @@
new /obj/item/stack/medical/suture/medicated(src)
new /obj/item/stack/medical/mesh(src)
+/obj/item/storage/survivalkit/legionifak
+ name = "Legion Trauma Kit"
+ desc = "A plastic case containing a basic trauma kit for a wide variety of wounds."
+ icon_state = "ifak"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+/obj/item/storage/survivalkit/legionifak/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 5
+
+/obj/item/storage/survivalkit/legionifak/PopulateContents()
+ new /obj/item/reagent_containers/pill/patch/bitterdrink(src)
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/paper/legionifak(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/xandertea(src)
+
+/obj/item/storage/survivalkit/ncrifak
+ name = "NCR Trauma Kit"
+ desc = "A plastic case containing a basic trauma kit for a wide variety of wounds."
+ icon_state = "ifak"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+/obj/item/storage/survivalkit/ncrifak/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 5
+
+/obj/item/storage/survivalkit/ncrifak/PopulateContents()
+ new /obj/item/reagent_containers/hypospray/medipen(src)
+ new /obj/item/stack/medical/gauze(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/ointment(src)
+ new /obj/item/paper/ncrifak(src)
+
/obj/item/storage/survivalkit_empty
name = "survival kit"
desc = "A robust leather pouch containing the essentials for wasteland survival."
icon_state = "survivalkit"
w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/storage/survivalkit_empty/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 4
diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm
index cb28b0f506..ae6a18c9a6 100644
--- a/code/modules/clothing/head/f13factionhead.dm
+++ b/code/modules/clothing/head/f13factionhead.dm
@@ -72,6 +72,7 @@
/obj/item/clothing/head/helmet/f13/raider/wastehound
name = "wastehound raider helmet"
desc = "A sack hood made out of a suspicious leather with tufts of hair sticking out. This mask would make Leatherface proud."
+ mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
icon_state = "wastehound_hood_icon"
item_state = "raider_wastehound_hood"
visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
diff --git a/code/modules/clothing/neck/mantle.dm b/code/modules/clothing/neck/mantle.dm
index ffd7843baf..5f0510fd03 100644
--- a/code/modules/clothing/neck/mantle.dm
+++ b/code/modules/clothing/neck/mantle.dm
@@ -48,10 +48,16 @@
desc = "Issued to the Elders of the Brotherhood. Style over substance is important. This one is designed to be worn over the shoulder."
icon_state = "bosshouldercape_r"
-/obj/item/clothing/neck/mantle/bos/paladin
- name = "Paladin cape"
- desc = "This stylish deep crimson cape is made to be worn below a power armor pauldron, a shoulder holster is added for utility."
- icon_state = "paladin"
+/obj/item/clothing/neck/mantle/bos/shortpaladin
+ name = "short paladin cape"
+ desc = "This stylish deep crimson cape is made to be worn below a power armor pauldron, a shoulder holster is added for utility. Shorter version."
+ icon_state = "palcapes"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+
+/obj/item/clothing/neck/mantle/bos/longpaladin
+ name = "long paladin cape"
+ desc = "This stylish deep crimson cape is made to be worn below a power armor pauldron, a shoulder holster is added for utility. Longer version."
+ icon_state = "palcapel"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
/obj/item/clothing/neck/mantle/ranger
@@ -60,6 +66,12 @@
icon_state = "rangercape"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+/obj/item/clothing/neck/mantle/rangerponcho
+ name = "NCR ranger poncho"
+ desc = "An old poncho used by rangers to protect from the natural elements. Most likely has a holster hidden underneath."
+ icon_state = "rangerponcho"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bos/paladin
+
/obj/item/clothing/neck/mantle/chief
name = "chieftains mantle"
desc = "A symbol of the authority of the Wayfarer Chief."
diff --git a/code/modules/clothing/suits/f13armor.dm b/code/modules/clothing/suits/f13armor.dm
index 6c1378ff41..97a67234ed 100644
--- a/code/modules/clothing/suits/f13armor.dm
+++ b/code/modules/clothing/suits/f13armor.dm
@@ -339,12 +339,12 @@
/obj/item/clothing/suit/armor/f13/power_armor/raiderpa
powered = FALSE
- name = "raider T-45b power armor"
- desc = "An attempt by raider engineers to duplicate power armor. They failed miserably, but it is still pretty tough"
+ name = "raider power armor"
+ desc = "An attempt by raider engineers to duplicate power armor. They failed miserably, but it is still pretty tough."
icon_state = "raiderpa"
item_state = "raiderpa"
- armor = list("melee" = 65, "bullet" = 55, "laser" = 55, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 50, "fire" = 80, "acid" = 0, "wound" = 65)
- slowdown = 0.25
+ armor = list("melee" = 65, "bullet" = 50, "laser" = 60, "energy" = 25, "bomb" = 50, "bio" = 50, "rad" = 70, "fire" = 80, "acid" = 0, "wound" = 65)
+ slowdown = 0.35
requires_training = FALSE
/obj/item/clothing/suit/armor/f13/power_armor/hotrod
diff --git a/code/modules/clothing/suits/f13suits.dm b/code/modules/clothing/suits/f13suits.dm
index 1b051dd267..b11b91da40 100644
--- a/code/modules/clothing/suits/f13suits.dm
+++ b/code/modules/clothing/suits/f13suits.dm
@@ -275,7 +275,7 @@
icon_state = "khan_jacket"
item_state = "khan_jacket"
body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0)
+ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0, "wound" = 40)
slowdown = 0.05
pocket_storage_component_path = /datum/component/storage/concrete/pockets
@@ -290,7 +290,7 @@
icon_state = "khan_jacket_armored"
item_state = "khan_jacket_armored"
body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
- armor = list("melee" = 37, "bullet" = 37, "laser" = 40, "energy" = 25, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0)
+ armor = list("melee" = 37, "bullet" = 37, "laser" = 40, "energy" = 25, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0, "wound" = 45)
slowdown = 0.08
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
@@ -305,7 +305,7 @@
icon_state = "khan_heavy"
item_state = "khan_heavy"
body_parts_covered = CHEST|GROIN|ARMS|LEGS|HANDS|FEET
- armor = list("melee" = 40, "bullet" = 40, "laser" = 47, "energy" = 25, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0)
+ armor = list("melee" = 45, "bullet" = 45, "laser" = 50, "energy" = 25, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 0, "wound" = 50)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
slowdown = 0.2
@@ -320,7 +320,7 @@
desc = "A worn-down white labcoat with some wiring hanging from the right side.
Upon closer inspection, you can see an ancient bloodstains that could tell an entire story about thrilling adventures of a previous owner."
icon_state = "followers"
item_state = "labcoat"
- armor = list("melee" = 25, "bullet" = 15, "laser" = 20, "energy" = 25, "bomb" = 20, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
+ armor = list("melee" = 25, "bullet" = 15, "laser" = 20, "energy" = 25, "bomb" = 20, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0, "wound" = 33)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/medical
/obj/item/clothing/suit/armor/f13/generaluniform
diff --git a/code/modules/clothing/under/f13.dm b/code/modules/clothing/under/f13.dm
index 352acf100a..14fb752855 100644
--- a/code/modules/clothing/under/f13.dm
+++ b/code/modules/clothing/under/f13.dm
@@ -1681,9 +1681,9 @@
icon_state = "mutie_ranger_under"
item_state = "mutie_ranger_under"
-/obj/item/clothing/under/f13/desert_ranger_scout
- name = "desert ranger scouting uniform"
- desc = "A set of clothing worn by desert ranger scouts."
+/obj/item/clothing/under/f13/arizona_ranger_scout
+ name = "Arizona ranger scouting uniform"
+ desc = "A set of clothing worn by Arizona ranger scouts."
icon_state = "scoutclothes"
can_adjust = FALSE
item_state = "scoutclothes"
diff --git a/code/modules/fallout/obj/food_and_drinks/food.dm b/code/modules/fallout/obj/food_and_drinks/food.dm
index d616455a92..4d35d02034 100644
--- a/code/modules/fallout/obj/food_and_drinks/food.dm
+++ b/code/modules/fallout/obj/food_and_drinks/food.dm
@@ -578,7 +578,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 24)
filling_color = "B#22222"
foodtype = MEAT
-
+
/obj/item/reagent_containers/food/snacks/f13/mirelurkcake
name = "mirelurk cake"
desc = "A savory cake made from the meat of a Mirelurk. A popular dish from the coastlines."
@@ -859,3 +859,4 @@
tastes = list("beef luncheon loaf" = 3, "jalapeno peppers and spices" = 2)
trash = /obj/item/trash/f13/k_ration
foodtype = MEAT
+
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index ec6a5e12f0..5051e5f65c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -694,6 +694,11 @@
list_reagents = list(/datum/reagent/consumable/ethanol/nukashine = 100)
foodtype = NUKA
+/obj/item/reagent_containers/food/drinks/bottle/xandertea
+ name = "flask of xander tea"
+ desc = "A flask of xander tea, often drank by Legionaries and Tribals to deal with blood loss."
+ icon_state = "flask"
+ list_reagents = list(/datum/reagent/consumable/tea/xandertea = 50)
// Empty bottles
/obj/item/reagent_containers/food/drinks/bottle/brown/white
diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm
index 7d99f44053..db6d4f340c 100644
--- a/code/modules/jobs/job_types/bos.dm
+++ b/code/modules/jobs/job_types/bos.dm
@@ -44,6 +44,8 @@ Main doors: ACCESS_CAPTAIN 20
H.mind.teach_crafting_recipe(/datum/crafting_recipe/boscombathelmetmk2)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/bos)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/gate_bos)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/*
Elder
*/
diff --git a/code/modules/jobs/job_types/followers.dm b/code/modules/jobs/job_types/followers.dm
index ad32042807..d1f88f4385 100644
--- a/code/modules/jobs/job_types/followers.dm
+++ b/code/modules/jobs/job_types/followers.dm
@@ -65,6 +65,9 @@ Administrator
ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src)
ADD_TRAIT(H, TRAIT_SURGERY_HIGH, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/followers/f13leadpractitioner
name = "Followers Administrator"
@@ -119,6 +122,9 @@ Professor
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/followers/f13Professor
name = "Followers Scientist"
diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm
index 2c2212a801..57205ee4c5 100644
--- a/code/modules/jobs/job_types/legion.dm
+++ b/code/modules/jobs/job_types/legion.dm
@@ -198,6 +198,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
l_pocket = /obj/item/flashlight/lantern
box = /obj/item/storage/survivalkit/tribal/adv
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/restraints/legcuffs/bola = 1,
/obj/item/storage/bag/money/small/legion = 1,
/obj/item/warpaint_bowl = 1,
@@ -295,6 +296,7 @@ commented out pending rework*/
r_pocket = /obj/item/flashlight/lantern
box = /obj/item/storage/survivalkit/tribal/adv
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/ammo_box/a357 = 1,
/obj/item/gun/ballistic/revolver/colt357 = 1,
/obj/item/restraints/handcuffs = 1,
@@ -375,6 +377,7 @@ commented out pending rework*/
l_pocket = /obj/item/restraints/handcuffs
box = /obj/item/storage/survivalkit/tribal/adv
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/melee/onehanded/machete/gladius = 1,
/obj/item/storage/bag/money/small/legofficers = 1,
/obj/item/grenade/smokebomb = 1,
@@ -458,6 +461,7 @@ commented out pending rework*/
r_pocket = /obj/item/flashlight/lantern
l_pocket = /obj/item/storage/survivalkit/tribal
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/restraints/handcuffs = 1,
/obj/item/storage/bag/money/small/legofficers = 1,
@@ -519,6 +523,7 @@ commented out pending rework*/
r_pocket = /obj/item/storage/bag/money/small/legofficers
l_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/ammo_box/magazine/m10mm_adv/simple = 2,
/obj/item/reagent_containers/pill/patch/bitterdrink = 1,
)
@@ -581,6 +586,7 @@ commented out pending rework*/
gloves = /obj/item/clothing/gloves/legion/plated
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/restraints/handcuffs = 1,
/obj/item/megaphone/cornu = 1,
@@ -651,6 +657,7 @@ commented out pending rework*/
l_pocket = /obj/item/binoculars
suit_store = /obj/item/gun/ballistic/revolver/revolver45
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/ammo_box/c45/improvised = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
@@ -732,6 +739,7 @@ commented out pending rework*/
shoes = /obj/item/clothing/shoes/f13/military/plated
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/restraints/handcuffs = 1,
@@ -824,6 +832,7 @@ commented out pending rework*/
r_pocket = /obj/item/flashlight/lantern
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/melee/onehanded/machete/forgedmachete = 1,
@@ -900,6 +909,7 @@ commented out pending rework*/
glasses = /obj/item/clothing/glasses/legiongoggles
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
+ /obj/item/storage/survivalkit/legionifak = 1,
/obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/patch/healingpowder = 1,
/obj/item/melee/onehanded/machete = 1,
@@ -1018,6 +1028,9 @@ commented out pending rework*/
H.mind.teach_crafting_recipe(/datum/crafting_recipe/strongrocket)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/empgrenade)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/steeltower)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/yumi)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
// AUXILIA - Civilians with special training. Can sow new uniforms for soldiers who lost theirs, and are loyal so they would never abuse this.
@@ -1074,6 +1087,8 @@ commented out pending rework*/
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tailor/legionuniform)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/warpaint)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/loadout/auxassist
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index c53e0bbf93..50811d6252 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -200,6 +200,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/lighter = 1,
/obj/item/reagent_containers/food/snacks/grown/tobacco/dried = 1,
+ /obj/item/storage/box/ration/menu_two = 1,
)
/datum/outfit/loadout/elcapitan
@@ -207,7 +208,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle/elcapitan
backpack_contents = list(
/obj/item/ammo_box/magazine/m14mm = 3,
- /obj/item/storage/box/ration/menu_two = 1,
/obj/item/melee/onehanded/knife/trench = 1,
)
@@ -217,7 +217,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/ammo_box/magazine/m44 = 3,
/obj/item/twohanded/sledgehammer/rockethammer/courtmartial = 1,
- /obj/item/storage/box/ration/menu_eight = 1,
)
@@ -266,6 +265,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/ammo_box/magazine/garand308 = 1,
/obj/item/grenade/smokebomb = 1,
+ /obj/item/storage/box/ration/menu_eight = 1
)
/datum/outfit/job/ncr/f13lieutenant/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -319,6 +319,10 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/storage/survivalkit/aid = 1,
/obj/item/storage/bag/money/small/ncrofficers = 1,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
+ /obj/item/ammo_box/magazine/m9mmds = 3,
+ /obj/item/storage/box/ration/menu_eight = 1,
+ /obj/item/book/granter/trait/trekking = 1,
)
/datum/outfit/loadout/sergeantrifleman
@@ -327,24 +331,19 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m5mm = 1,
- /obj/item/storage/box/ration/menu_two = 1,
- /obj/item/melee/onehanded/knife/bowie = 1,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 3,
+ /obj/item/melee/onehanded/knife/trench = 1,
/obj/item/flashlight/seclite = 1,
/obj/item/grenade/f13/frag = 1,
)
/datum/outfit/loadout/sergeantrecon
name = "Recon"
- suit_store = /obj/item/gun/ballistic/automatic/m1carbine/compact
+ suit_store = /obj/item/gun/ballistic/automatic/smg/smg10mm
head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m10mm_adv/ext = 2,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 3,
+ /obj/item/melee/onehanded/knife/trench = 1,
/obj/item/storage/box/ration/menu_eight = 1,
- /obj/item/attachments/scope = 1,
/obj/item/book/granter/trait/trekking = 1,
/obj/item/grenade/f13/frag = 1,
)
@@ -354,12 +353,11 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/shotgun/trench //Over thereee over thereeeee spread the spread the word over thereeee
head = /obj/item/clothing/head/f13/ncr/goggles
backpack_contents = list(
- /obj/item/ammo_box/shotgun/buck = 2,
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/shotgun/slug = 1,
/obj/item/clothing/mask/gas = 1,
/obj/item/grenade/smokebomb = 2,
/obj/item/melee/onehanded/knife/bayonet = 1,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 3,
)
/datum/job/ncr/f13representative
@@ -683,7 +681,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/survivalkit/aid = 1,
/obj/item/ammo_box/magazine/m9mmds = 2,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
- /obj/item/grenade/f13/frag = 1,
+ /obj/item/storage/box/ration/menu_two = 1,
+ /obj/item/grenade/f13/frag = 1
)
/datum/outfit/loadout/shockht
@@ -746,6 +745,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingrifle)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/huntingshotgun)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/m1carbine)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
/datum/outfit/job/ncr/f13combatengineer
@@ -762,6 +763,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/shovel/trench = 1,
/obj/item/storage/survivalkit/aid = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_two = 1,
)
/datum/outfit/loadout/combatengineerbuilder
@@ -831,6 +833,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m45 = 3,
/obj/item/storage/survivalkit/aid = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
/datum/outfit/job/ncr/f13mp/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -871,13 +874,14 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
mask = /obj/item/clothing/mask/surgical
gloves = /obj/item/clothing/gloves/color/latex/nitrile
accessory = /obj/item/clothing/accessory/armband/med/ncr
- suit_store = /obj/item/gun/ballistic/automatic/m1carbine/m1n
+ suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
- /obj/item/ammo_box/magazine/m10mm_adv/simple = 2,
+ /obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/melee/onehanded/knife/survival = 1,
/obj/item/storage/survivalkit/aid/adv = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/storage/firstaid/regular = 1,
+ /obj/item/storage/box/ration/menu_one = 1,
)
/datum/outfit/job/ncr/f13combatmedic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -929,6 +933,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/melee/onehanded/knife/bayonet = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/storage/survivalkit/aid = 1,
+ /obj/item/storage/box/ration/menu_one = 1,
+ /obj/item/book/granter/trait/trekking = 1,
)
/datum/outfit/loadout/corporaldesignatedmarksman
@@ -936,14 +942,14 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit = /obj/item/clothing/suit/armor/f13/ncrarmor/mantle
head = /obj/item/clothing/head/f13/ncr/steelpot_bandolier
neck = /obj/item/storage/belt/holster/legholster
- suit_store = /obj/item/gun/ballistic/rifle/hunting/remington
+ suit_store = /obj/item/gun/ballistic/automatic/marksman
backpack_contents = list(
- /obj/item/attachments/scope = 1,
- /obj/item/ammo_box/a762 = 4,
+ /obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mmds = 1,
+ /obj/item/ammo_box/magazine/m9mmds = 2,
+ /obj/item/storage/belt/holster/legholster = 1,
/obj/item/storage/box/ration/menu_two = 1,
- /obj/item/grenade/smokebomb = 1,
+ /obj/item/grenade/smokebomb = 1
)
/datum/outfit/loadout/corporalrifleman
@@ -955,7 +961,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/storage/box/ration/menu_one = 1,
/obj/item/book/granter/trait/trekking = 1,
- /obj/item/grenade/f13/frag = 1,
+ /obj/item/grenade/f13/frag = 1
)
@@ -974,7 +980,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
loadout_options = list(
/datum/outfit/loadout/trooperrifleman, // Service Rifle, Bayonet
- /datum/outfit/loadout/trooperfiresupport, // M1/n carbine, Trench tool
+ /datum/outfit/loadout/trooperfiresupport, // Hunting Rifle
+ /datum/outfit/loadout/troopershotgun, // Hunting shotgun, Trench tool
)
matchmaking_allowed = list(
@@ -996,6 +1003,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
glasses = null
backpack_contents = list(
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/survivalkit/ncrifak = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
/datum/outfit/loadout/trooperrifleman
@@ -1004,16 +1013,25 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/melee/onehanded/knife/bayonet = 1,
- /obj/item/storage/box/ration/menu_two = 1,
)
/datum/outfit/loadout/trooperfiresupport
+ name = "Sharpshooter"
+ suit_store = /obj/item/gun/ballistic/rifle/hunting
+ backpack_contents = list(
+ /obj/item/attachments/scope = 1,
+ /obj/item/ammo_box/a762 = 3,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
+ /obj/item/ammo_box/magazine/m9mmds = 2,
+ )
+
+/datum/outfit/loadout/troopershotgun
name = "Reservist"
- suit_store = /obj/item/gun/ballistic/automatic/m1carbine/m1n
+ suit_store = /obj/item/gun/ballistic/shotgun/hunting
backpack_contents = list(
- /obj/item/ammo_box/magazine/m10mm_adv/ext = 2,
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/shotgun/slug = 1,
/obj/item/shovel/trench = 1,
- /obj/item/storage/box/ration/menu_eight = 1,
)
@@ -1069,6 +1087,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/survivalkit/aid/adv = 1,
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/storage/firstaid/regular = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
/datum/outfit/job/ncr/f13medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1122,6 +1141,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
H.mind.teach_crafting_recipe(/datum/crafting_recipe/servicerifle)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/scoutcarbine)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
/datum/outfit/job/ncr/f13logisticsofficer // Grease Gun, 9mm sidearm, Survival knife, C-4 bomb, Extra materials, Full blueprints
@@ -1147,7 +1168,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/stack/sheet/metal/twenty = 2,
/obj/item/stack/sheet/glass/ten = 2,
- /obj/item/book/granter/trait/explosives = 1
+ /obj/item/book/granter/trait/explosives = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
@@ -1201,6 +1223,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m556/rifle/small = 2,
/obj/item/shovel/trench = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
// Technician Salvaging
@@ -1218,6 +1241,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/metaldetector = 1,
/obj/item/weldingtool/largetank = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
// Corpsman Chemistry, simple medical
@@ -1235,6 +1259,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/book/granter/trait/chemistry = 1,
/obj/item/book/granter/trait/lowsurgery = 1,
/obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
)
// Off-duty Snazzy jacket, saved up money for leave
diff --git a/code/modules/jobs/job_types/oasis.dm b/code/modules/jobs/job_types/oasis.dm
index c922c232f6..82cebe8c8c 100644
--- a/code/modules/jobs/job_types/oasis.dm
+++ b/code/modules/jobs/job_types/oasis.dm
@@ -56,6 +56,9 @@ Mayor
return
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/den/f13mayor
name = "Mayor"
@@ -517,6 +520,9 @@ Mayor
return
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/*--------------------------------------------------------------*/
@@ -1049,6 +1055,8 @@ Mayor
H.mind.teach_crafting_recipe(/datum/crafting_recipe/uzi)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/smg10mm)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
/datum/outfit/job/den/f13shopkeeper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
diff --git a/code/modules/jobs/job_types/tribals.dm b/code/modules/jobs/job_types/tribals.dm
index 4abb83004a..7ebb2928bc 100644
--- a/code/modules/jobs/job_types/tribals.dm
+++ b/code/modules/jobs/job_types/tribals.dm
@@ -33,6 +33,7 @@
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribal_pa)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribal_pa_helmet)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalwar/yumi)
/*
Tribal Chief
diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm
index 62c796394c..1b04684f2c 100644
--- a/code/modules/jobs/job_types/wasteland.dm
+++ b/code/modules/jobs/job_types/wasteland.dm
@@ -241,7 +241,8 @@ Raider
if(visualsOnly)
return
ADD_TRAIT(H, TRAIT_LONGPORKLOVER, src)
-
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/wastehound)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/raiderpa)
H.social_faction = FACTION_RAIDERS
add_verb(H, /mob/living/proc/creategang)
@@ -427,6 +428,7 @@ Raider
/obj/item/melee/onehanded/knife/bone = 1,
/obj/item/radio/tribal = 1,
/obj/item/book/granter/trait/bigleagues = 1,
+ /obj/item/book/granter/crafting_recipe/blueprint/yumi = 1,
)
/datum/outfit/loadout/raider_mobster
@@ -494,7 +496,7 @@ Raider
/datum/outfit/loadout/warrior,
/datum/outfit/loadout/ncrcitizen,
/datum/outfit/loadout/legioncivilian,
- /datum/outfit/loadout/wastelander_desert_ranger)
+ /datum/outfit/loadout/wastelander_arizona_ranger)
/datum/outfit/job/wasteland/f13wastelander
name = "Wastelander"
@@ -645,9 +647,9 @@ Raider
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle=2)
-/datum/outfit/loadout/wastelander_desert_ranger
- name = "Desert Ranger Scout"
- uniform = /obj/item/clothing/under/f13/desert_ranger_scout
+/datum/outfit/loadout/wastelander_arizona_ranger
+ name = "Arizona Ranger Scout"
+ uniform = /obj/item/clothing/under/f13/arizona_ranger_scout
shoes = /obj/item/clothing/shoes/f13/cowboy
head = /obj/item/clothing/head/f13/cowboy
gloves = /obj/item/clothing/gloves/color/brown
@@ -955,7 +957,9 @@ Raider
..()
ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
-
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
/datum/outfit/job/wasteland/f13mobboss/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -1024,6 +1028,9 @@ datum/job/wasteland/f13dendoctor
H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/den)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/plasmasniper)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/tribalradio)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/durathread_vest)
/datum/outfit/job/wasteland/f13dendoctor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1251,7 +1258,9 @@ datum/job/wasteland/f13dendoctor
/datum/crafting_recipe/tribalwar/bracers,
/datum/crafting_recipe/tribal/bonetalisman,
/datum/crafting_recipe/tribal/bonebag,
- /datum/crafting_recipe/tribalwar/spearquiver
+ /datum/crafting_recipe/tribalwar/spearquiver,
+ /datum/crafting_recipe/tribalwar/yumi,
+ /datum/crafting_recipe/durathread_vest
)
for(var/datum/crafting_recipe/recipe as() in recipes)
H.mind.teach_crafting_recipe(recipe)
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
index e6e46165f7..5447b4be93 100644
--- a/code/modules/paperwork/paper_premade.dm
+++ b/code/modules/paperwork/paper_premade.dm
@@ -255,3 +255,23 @@
Mix the fermented results of Xander root, barrel cactii,broc flowers and Sarsaparilla together in a large glass beaker.
Bitter drink should be the result which can then be bottled by crafting. It is a very potent drink, so more than two should not be consumed."}
+
+/obj/item/paper/legionifak
+ name = "Legion Trauma Kit Instructions"
+ info = {"Bandages stop bleeding. Cut some bed sheets, or use some cloth to turn them into improvised gauze. You can then microwave them to get medical gauze.
+
+
Sutures close wounds with excessive use, and can also be used to heal brute damage. While closing wounds, you will keep bleeding so bandage yourself first. You can get more by using the method above, but instead of microwaving the gauze combine it with alcohol via medical crafting to make improvised sutures.
+
+
Ointment is used to treat burns. Apply the ointment to the burnt areas. Severe burn wounds will require you to bandage it then apply ointment. You can make more ointment through combining agave and gauze via crafting.
+
+
Xander tea will help you recover blood and slow down blood loss. You can get more xander tea by juicing xander roots in a grinder, adding twice the amount of water as xander juice and heating it in a microwave or using a lighter/zippo/welder on it."}
+
+/obj/item/paper/ncrifak
+ name = "NCR Trauma Kit Instructions"
+ info = {"Bandages stop bleeding. Cut some bed sheets, or use some cloth to turn them into improvised gauze. You can then microwave them to get medical gauze. You can then combine the gauze and sterilizine (found via medical vendor) to make improved gauze.
+
+
Sutures close wounds with excessive use, and can also be used to heal brute damage. While closing wounds, you will keep bleeding so bandage yourself first. You can get more by using the method above, but instead of microwaving the gauze combine it with alcohol or styptic powder (can be found in a medical vendor) via medical crafting to make improvised sutures and normal sutures respectively.
+
+
Ointment is used to treat burns. Apply the ointment to the burnt areas. Severe burn wounds will require you to bandage it then apply ointment. You can make more ointment through combining agave and gauze via crafting. You can make regenerative mesh through combining silver sulfadiazine (obtained via medical vendor) which is a superior ointment.
+
+
Epinephrine will clot excessive wounds, halting blood loss and preventing death in critical condition, preserve for when you're bleeding out. You can get more epipens from medical vendors in old ruins or general scavenging."}
diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm
index bd6c265dff..fac7702cf6 100644
--- a/code/modules/projectiles/ammunition/caseless/arrow.dm
+++ b/code/modules/projectiles/ammunition/caseless/arrow.dm
@@ -73,3 +73,10 @@
desc = "An arrow made of wood, tipped with bronze. The tip is dense enough to provide some armor penetration."
icon_state = "bronzearrow"
projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze
+
+/obj/item/ammo_casing/caseless/arrow/explosive
+ name = "explosive arrow"
+ desc = "An arrow with a pressure-activated explosive charge at the end. Cannot be reused."
+ icon = 'icons/fallout/objects/guns/ammo.dmi'
+ icon_state = "arrow_explosive"
+ projectile_type = /obj/item/projectile/bullet/reusable/arrow/explosive
diff --git a/code/modules/projectiles/boxes_magazines/internal/bow.dm b/code/modules/projectiles/boxes_magazines/internal/bow.dm
index 9f9f0ef219..8bc512f9e2 100644
--- a/code/modules/projectiles/boxes_magazines/internal/bow.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/bow.dm
@@ -28,3 +28,10 @@
//Crossbow Ammo
/obj/item/ammo_box/magazine/internal/bow/cross
max_ammo = 3 // 4 shots in total
+
+//Yumi Ammo
+/obj/item/ammo_box/magazine/internal/bow/yumi
+ name = "yumi internal magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/arrow
+ caliber = "arrow"
+ max_ammo = 1 // 1 shots in total
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index e1c9790c2e..dc0c21985a 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -1091,24 +1091,31 @@
//R93 PDW Keywords: 5.56mm, Semi-Automatic, 20 (10-50) round magazine, Pistol grip
/obj/item/gun/ballistic/automatic/r93
- name = "R93 PDW"
- desc = "A lightweight assault rifle manufactured by the Brotherhood of Steel with a folding stock, based on weapons from the R-series platforms. It is generally issued to Brotherhood Knights for scouting missions."
+ name = "r93 assault rifle"
+ desc = "A lightweight assault rifle manufactured by the Brotherhood of Steel with a folding stock, based on weapons from the R-series platforms. It is generally issued to Brotherhood knights for most combat operations."
icon_state = "r93"
item_state = "r93"
mag_type = /obj/item/ammo_box/magazine/m556/rifle
- fire_delay = 3.25
- spread = 1
- extra_damage = 25
- burst_size = 1
- can_attachments = FALSE
- semi_auto = TRUE
- automatic_burst_overlay = FALSE
+ fire_delay = 2.5
+ slowdown = 0.3
+ spread = 10
+ extra_damage = 21
+ recoil = 0.125
+ is_automatic = TRUE
+ automatic = 1
+ autofire_shot_delay = 2.75
+ can_attachments = TRUE
+ can_bayonet = FALSE
can_scope = FALSE
zoomable = TRUE
- zoom_amt = 6
- zoom_out_amt = 9
- can_bayonet = FALSE
- fire_sound = 'sound/weapons/Gunshot_large_silenced.ogg'
+ zoom_amt = 9
+ zoom_out_amt = 10
+ can_suppress = TRUE
+ suppressor_x_offset = 0
+ suppressor_y_offset = 0
+ suppressor_state = "r93_suppressor"
+ actions_types = list(/datum/action/item_action/toggle_firemode)
+ fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg'
//Type 93 Chinese rifle Keywords: 5.56mm, Automatic, 20 (10-50) round magazine
/obj/item/gun/ballistic/automatic/type93
diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm
index c3e5939bf2..5c79a7b73a 100644
--- a/code/modules/projectiles/guns/ballistic/bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bow.dm
@@ -145,3 +145,24 @@
zoom_amt = 10
zoom_out_amt = 13
can_scope = FALSE
+
+//Yumi
+/obj/item/gun/ballistic/bow/yumi
+ name = "Yumi"
+ desc = "A large, slow, unwieldy bow. While heavy and slow to fire, an arrow fired from it is likely to be devestating."
+ icon = 'icons/fallout/objects/guns/ballistic.dmi'
+ icon_state = "yumi"
+ item_state = "yumi"
+ icon_prefix = "yumi"
+ w_class = WEIGHT_CLASS_NORMAL
+ slowdown = 2
+ force = 30
+ extra_damage = 20
+ mag_type = /obj/item/ammo_box/magazine/internal/bow/yumi
+ fire_delay = 100
+ zoomable = TRUE
+ zoom_amt = 10
+ zoom_out_amt = 13
+ can_scope = FALSE
+ fire_sound = 'sound/weapons/bowfire.wav'
+ slot_flags = ITEM_SLOT_BACK
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 986bdb2991..043606a6be 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -253,13 +253,13 @@
pump_sound = 'sound/weapons/boltpump.ogg'
fire_sound = 'sound/f13weapons/boltfire.ogg'
-//Lee-Enfield,SMLE Keywords: 7.62, Bolt-action, 5 rounds internal, very fast firing rate
+//Lee-Enfield,SMLE Keywords: 7.62, Bolt-action, 5 rounds internal, very fast firing rate, stamina cost on working bolt (do not remove this)
/obj/item/gun/ballistic/rifle/enfield
name = "Lee-Enfield rifle"
- desc = "A british rifle sometimes known as the SMLE. It seems to have been re-chambered in .308."
+ desc = "An antiquated rifle. It can punch well above its weight class, but drains stamina to work the bolt."
icon_state = "enfield2"
item_state = "308"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smle
+ mag_type = /obj/item/ammo_box/magazine/internal/boltaction
extra_damage = 40
extra_speed = 600
fire_delay = 6
@@ -275,6 +275,7 @@
knife_y_offset = 21
pump_sound = 'sound/weapons/boltpump.ogg'
fire_sound = 'sound/f13weapons/boltfire.ogg'
+ pump_stam_cost = 10
diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm
index 4d3b775807..68b3ed94a7 100644
--- a/code/modules/projectiles/guns/energy/plasmaf13.dm
+++ b/code/modules/projectiles/guns/energy/plasmaf13.dm
@@ -157,6 +157,7 @@
name = "Plasma Cannon"
desc = "A refined design, taking the common wasteland plasma musket and improving upon it. Trash parts and safety hazards give way to proper stamped and machined construction. It's even been fitted with a scope and designed to take MFCs rather than shoddy plasma cans."
icon = 'icons/fallout/objects/guns/energy.dmi'
+ mob_overlay_icon = 'icons/fallout/onmob/backslot_weapon.dmi'
icon_state = "plasmasniper"
item_state = "plasmamusket"
slowdown = 0.3
diff --git a/code/modules/projectiles/projectile/reusable/arrow.dm b/code/modules/projectiles/projectile/reusable/arrow.dm
index 2229c0c5a4..49119c2b84 100644
--- a/code/modules/projectiles/projectile/reusable/arrow.dm
+++ b/code/modules/projectiles/projectile/reusable/arrow.dm
@@ -19,7 +19,7 @@
damage = 20
armour_penetration = 0.10
supereffective_damage = 40
- supereffective_faction = list("hostile", "ant", "supermutant", "deathclaw", "cazador", "raider", "china", "gecko", "wastebot")
+ supereffective_faction = list("hostile", "ant", "supermutant", "deathclaw", "cazador", "raider", "china", "gecko", "wastebot","radscorpion")
ammo_type = /obj/item/ammo_casing/caseless/arrow/bone
/obj/item/projectile/bullet/reusable/arrow/bronze //Just some AP shots
@@ -83,7 +83,7 @@
damage = 20
sharpness = SHARP_EDGED
ammo_type = /obj/item/ammo_casing/caseless/arrow/broadhead
- embedding = list(embed_chance=100, fall_chance=0, jostle_chance=3, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.2, pain_mult=3, jostle_pain_mult=5, rip_time=25, projectile_payload = /obj/item/ammo_casing/caseless/arrow/broadhead)
+ embedding = list(embed_chance=95, fall_chance=0, jostle_chance=3, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.2, pain_mult=3, jostle_pain_mult=5, rip_time=25, projectile_payload = /obj/item/ammo_casing/caseless/arrow/broadhead)
/obj/item/projectile/bullet/reusable/arrow/broadhead/on_hit(atom/target, blocked)
if(iscarbon(target))
@@ -99,3 +99,25 @@
armour_penetration = 0.05
damage = 30
ammo_type = /obj/item/ammo_casing/caseless/arrow/serrated
+
+/obj/item/projectile/bullet/reusable/arrow/explosive
+ name = "explosive arrow"
+ desc = "An arrow with a pressure-activated explosive charge at the end. Cannot be reused."
+ armour_penetration = 0.2
+ damage = 5
+ ammo_type = /obj/item/ammo_casing/caseless/arrow/explosive
+
+/obj/item/projectile/bullet/reusable/arrow/explosive/on_hit(atom/target, blocked=0)
+ . = ..()
+ if(!isliving(target)) //if the target isn't alive, so is a wall or something
+ explosion(target, 0, 0, 1, 1)
+ dropped = TRUE
+ else
+ explosion(target, 0, 0, 1, 1)
+ dropped = TRUE
+ new /obj/effect/temp_visual/explosion(get_turf(target))
+ return BULLET_ACT_HIT
+
+/obj/item/projectile/bullet/reusable/arrow/explosive/handle_drop()
+ if(!dropped)
+ dropped = FALSE
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 75fed4c26d..8bd2157941 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -433,6 +433,7 @@
reagent_state = LIQUID
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
+ overdose_threshold = 60
pH = 2.6
value = REAGENT_VALUE_COMMON
@@ -444,6 +445,11 @@
..()
return TRUE
+/datum/reagent/medicine/mine_salve/overdose_process(mob/living/M)
+ M.adjustToxLoss(2*REM, FALSE)
+ ..()
+ . = 1
+
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
if(method in list(INGEST, VAPOR, INJECT))
diff --git a/icons/fallout/clothing/mantles.dmi b/icons/fallout/clothing/mantles.dmi
index 769c631a7f..2fd84c4929 100644
Binary files a/icons/fallout/clothing/mantles.dmi and b/icons/fallout/clothing/mantles.dmi differ
diff --git a/icons/fallout/objects/guns/ammo.dmi b/icons/fallout/objects/guns/ammo.dmi
index 878fcd2570..83a42d52c7 100644
Binary files a/icons/fallout/objects/guns/ammo.dmi and b/icons/fallout/objects/guns/ammo.dmi differ
diff --git a/icons/fallout/objects/guns/attachments.dmi b/icons/fallout/objects/guns/attachments.dmi
index 5312b27e0f..6463e01371 100644
Binary files a/icons/fallout/objects/guns/attachments.dmi and b/icons/fallout/objects/guns/attachments.dmi differ
diff --git a/icons/fallout/objects/guns/ballistic.dmi b/icons/fallout/objects/guns/ballistic.dmi
index fa829b3fa1..26c27f3c59 100644
Binary files a/icons/fallout/objects/guns/ballistic.dmi and b/icons/fallout/objects/guns/ballistic.dmi differ
diff --git a/icons/fallout/objects/guns/energy.dmi b/icons/fallout/objects/guns/energy.dmi
index b8af7d74cb..4d76dfeb44 100644
Binary files a/icons/fallout/objects/guns/energy.dmi and b/icons/fallout/objects/guns/energy.dmi differ
diff --git a/icons/fallout/onmob/backslot_weapon.dmi b/icons/fallout/onmob/backslot_weapon.dmi
index 1b281a3cdd..bc41e9f409 100644
Binary files a/icons/fallout/onmob/backslot_weapon.dmi and b/icons/fallout/onmob/backslot_weapon.dmi differ
diff --git a/icons/fallout/onmob/clothes/mantle.dmi b/icons/fallout/onmob/clothes/mantle.dmi
index 9af42f41a8..905dff3831 100644
Binary files a/icons/fallout/onmob/clothes/mantle.dmi and b/icons/fallout/onmob/clothes/mantle.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 183721af5d..b299f6cfe8 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 6171c94b68..5dbe6f99ef 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -400,3 +400,11 @@ datum/gear/head/steelpot_bandolier
cost = 2
restricted_desc = "KHAN"
restricted_roles = list("Great Khan")
+
+/datum/gear/head/raider_wastehound
+ name = "Raider Wastehound Helmet"
+ path = /obj/item/clothing/head/helmet/f13/raider/wastehound
+ cost = 2
+ restricted_desc = "OUTLAW"
+ restricted_roles = list("outlaw")
+
diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm
index fcc0615de0..ffe6b272b0 100644
--- a/modular_citadel/code/modules/client/loadout/neck.dm
+++ b/modular_citadel/code/modules/client/loadout/neck.dm
@@ -23,6 +23,34 @@
name = "ragged mantle"
path = /obj/item/clothing/neck/mantle/ragged
+/datum/gear/neck/mantle/palcapes
+ name = "short paladin cape"
+ path = /obj/item/clothing/neck/mantle/bos/shortpaladin
+ cost = 3
+ restricted_desc = "Paladins"
+ restricted_roles = list("Head Paladin",
+ "Senior Paladin",
+ "Paladin",
+ )
+
+/datum/gear/neck/mantle/palcapel
+ name = "long paladin cape"
+ path = /obj/item/clothing/neck/mantle/bos/longpaladin
+ cost = 3
+ restricted_desc = "Paladins"
+ restricted_roles = list("Head Paladin",
+ "Senior Paladin",
+ "Paladin",
+ )
+
+/datum/gear/neck/mantle/rangerponcho
+ name = "NCR ranger poncho"
+ path = /obj/item/clothing/neck/mantle/rangerponcho
+ cost = 3
+ restricted_desc = "Rangers"
+ restricted_roles = list("NCR Ranger",
+ "NCR Veteran Ranger",
+ )
/datum/gear/neck/apron
name = "simple apron"
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index a0365f9a9d..48c7cec962 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -329,14 +329,14 @@
name = "grey turtleneck"
path = /obj/item/clothing/under/suit/turtle/grey
cost = 2
-/*
+
/datum/gear/uniform/detbrown
name = "Brown Worn Suit"
path = /obj/item/clothing/under/rank/security/detective/brown
- subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
- restricted_desc = "Detective"
- restricted_roles = list("Detective")
+ cost = 2
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SUITS
+/*
/datum/gear/uniform/detbrown/detbrown2
name = "Padded Worn Suit"
path = /obj/item/clothing/under/rank/security/detective/brown/brown2
@@ -626,3 +626,154 @@
/datum/gear/uniform/ranger/vet
name = "ranger flannel outfit"
path = /obj/item/clothing/under/f13/ranger/vet
+
+/datum/gear/uniform/skirt/white
+ name = "white suitskirt"
+ path = /obj/item/clothing/under/suit/white_on_white/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/polychromic
+ name = "polychromic skirt"
+ path = /obj/item/clothing/under/dress/skirt/polychromic
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/polychromic/pleated
+ name = "polychromic pleated skirt"
+ path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/red
+ name = "red plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/green
+ name = "green plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid/green
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/blue
+ name = "blue plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid/blue
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/plaid/purple
+ name = "purple plaid skirt"
+ path = /obj/item/clothing/under/dress/skirt/plaid/purple
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black
+ name = "black skirt"
+ path = /obj/item/clothing/under/dress/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/vcity
+ name = "VTCC jumpskirt"
+ path = /obj/item/clothing/under/f13/vault/vcity/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/tac
+ name = "''tactical'' combat skirt"
+ path = /obj/item/clothing/under/f13/legskirt/tac
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/swept
+ name = "swept skirt"
+ path = /obj/item/clothing/under/dress/skirt/swept
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/red
+ name = "red skirt"
+ path = /obj/item/clothing/under/dress/skirt/red
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/blue
+ name = "blue skirt"
+ path = /obj/item/clothing/under/dress/skirt/blue
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/purple
+ name = "purple skirt"
+ path = /obj/item/clothing/under/dress/skirt/purple
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/denim
+ name = "denim skirt"
+ path = /obj/item/clothing/under/pants/denimskirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/curator
+ name = "sensible suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/curator/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/blue/suit
+ name = "blue suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/purple/suit
+ name = "purple suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/blue/lawyer
+ name = "blue lawyer suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/red/lawyer
+ name = "red lawyer suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/red/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/executive/suit
+ name = "executive suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/really_black/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black/female/suit
+ name = "black female suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/female/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black/suit
+ name = "black lawyer suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/black/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/black/suit/alt
+ name = "black alt suitskirt"
+ path = /obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+
+/datum/gear/uniform/skirt/bartender
+ name = "bartender's skirt"
+ path = /obj/item/clothing/under/rank/civilian/bartender/skirt
+ cost = 1
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
+