")
if(severity)
data += "
"
- data += "[timestamp] | [server] | [admin_key][secret ? " | - Secret" : ""]"
+ data += "[timestamp] | [server] | Round [round_id] | [admin_key][secret ? " | - Secret" : ""]"
if(expire_timestamp)
data += " | Expires [expire_timestamp]"
data += "
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..5d9fb0d19a 100644 --- a/code/modules/clothing/under/f13.dm +++ b/code/modules/clothing/under/f13.dm @@ -360,6 +360,15 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = TRUE +/obj/item/clothing/under/f13/legorat + name = "legionary tunic" + desc = "A black cotton tunic with some leather pants, of good quality." + icon_state = "legoratb" + item_state = "legoratb" + fitted = FEMALE_UNIFORM_TOP + var/sleeves_adjusted = 0 + can_adjust = TRUE + /obj/item/clothing/under/f13/legskirt/tac name = "\improper ''tactical'' combat skirt" desc = "A leathery skirt below a thick, black, long-sleeve cotton shirt. Perfect for operatives favoring wardrobe malfunctions." @@ -1681,9 +1690,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..1239e3c5a6 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,29 @@ tastes = list("beef luncheon loaf" = 3, "jalapeno peppers and spices" = 2) trash = /obj/item/trash/f13/k_ration foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/kebab/f13 + name = "generic kebab" + desc = "you goofed" + icon = 'icons/fallout/objects/food&drinks/food.dmi' //we need to start migrating more foods to this path + +/obj/item/reagent_containers/food/snacks/kebab/f13/gecko + name = "gecko kebab" + desc = "delicious bits of gecko on a metal skewer" + icon_state = "squirrelbits" //the gecko kebab sprite is ass, please change ASAP + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/water = 5) //healthy, will slightly reduce bloodloss + tastes = list("meat" = 4, "scales" = 1) + +/obj/item/reagent_containers/food/snacks/kebab/f13/ghost + name = "kebab el fuego" + desc = "mutant ghost peppers on a skewer, feel the heat of a nuclear blast on your tastebuds." + icon_state = "squirrelbits" //placeholder, make new sprite + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/condensedcapsaicin = 8) + +/obj/item/reagent_containers/food/snacks/kebab/f13/squirrelstick //heals on eat, has slight radiation + name = "squirrel on a stick" + desc = "It's a whole squirrel roasted on a stick. Tastes of home on the wastes." + icon_state = "squrrielstick" + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/radium = 1) + 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/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm index 7fce15ac6a..d13a3aa044 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_wastefood.dm @@ -76,7 +76,7 @@ /obj/item/reagent_containers/food/snacks/meat/steak/squirrel = 2, /obj/item/stack/rods = 1 ) - result = /obj/item/reagent_containers/food/snacks/f13/squirrelstick + result = /obj/item/reagent_containers/food/snacks/kebab/f13/squirrelstick subcategory = CAT_WASTEFOOD /datum/crafting_recipe/food/squirrelstew diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm index 7d99f44053..029356c2de 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 */ @@ -431,7 +433,6 @@ Star Paladin /obj/item/melee/onehanded/knife/hunting = 1, /obj/item/reagent_containers/hypospray/medipen/stimpak = 2, /obj/item/melee/unarmed/powerfist = 1, - /obj/item/tank/internals/oxygen = 1, ) /datum/outfit/loadout/spaladina @@ -446,7 +447,6 @@ Star Paladin name = "Frontline Senior Paladin" backpack_contents = list( /obj/item/gun/energy/laser/aer12 = 1, - /obj/item/attachments/scope = 1, /obj/item/stock_parts/cell/ammo/mfc = 2, /obj/item/gun/ballistic/automatic/pistol/mk23 = 1, /obj/item/ammo_box/magazine/m45exp = 2, 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..b97d6a87e6 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, @@ -503,24 +507,30 @@ commented out pending rework*/ spawn_positions = 1 outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13orator display_order = JOB_DISPLAY_ORDER_ORATOR + exp_requirements = 900 access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND) minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND) -/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator // 10mm Revolver, Spatha +/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator // Spatha, Automag name = "Orator" jobtype = /datum/job/CaesarsLegion/Legionnaire/f13orator - neck = /obj/item/storage/belt/holster + neck = /obj/item/clothing/neck/mantle/legionmantle suit = /obj/item/clothing/suit/armor/f13/legion/vet/orator - head = null + mask = /obj/item/clothing/mask/bandana/legion/legvet + uniform = /obj/item/clothing/under/f13/legorat + head = /obj/item/clothing/head/helmet/f13/legion/vet/orator id = /obj/item/card/id/dogtag/legveteran - gloves = null - shoes = /obj/item/clothing/shoes/roman - suit_store = /obj/item/gun/ballistic/automatic/pistol/n99 + shoes = /obj/item/clothing/shoes/f13/military/legion + gloves = /obj/item/clothing/gloves/legion + suit_store = /obj/item/melee/onehanded/machete/spatha r_pocket = /obj/item/storage/bag/money/small/legofficers l_pocket = /obj/item/flashlight/lantern backpack_contents = list( - /obj/item/ammo_box/magazine/m10mm_adv/simple = 2, + /obj/item/storage/survivalkit/legionifak = 1, /obj/item/reagent_containers/pill/patch/bitterdrink = 1, + /obj/item/clothing/neck/mantle/legiontoga = 1, + /obj/item/gun/ballistic/automatic/pistol/automag = 1, + /obj/item/ammo_box/magazine/automag = 2, ) /datum/outfit/job/CaesarsLegion/Legionnaire/f13orator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -530,8 +540,8 @@ commented out pending rework*/ ADD_TRAIT(H, TRAIT_LIFEGIVER, src) ADD_TRAIT(H, TRAIT_IRONFIST, src) ADD_TRAIT(H, TRAIT_BIG_LEAGUES, src) - - + + // VEXILLARIUS /datum/job/CaesarsLegion/Legionnaire/f13vexillarius @@ -581,6 +591,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 +662,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 +744,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 +837,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 +914,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,7 +1033,10 @@ 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 +1092,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 @@ -1119,7 +1139,7 @@ commented out pending rework*/ /obj/item/stack/sheet/prewar/twenty = 1, /obj/item/weldingtool = 1, /obj/item/book/granter/trait/explosives = 1 - ) + ) // LEGION SLAVES - Servant cook, and assist with medical, low surgery. Worker farm and mine. // Both get Mars teachings to help out when normal work is done. diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm index c53e0bbf93..43084489cd 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, ) @@ -260,12 +259,13 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. r_pocket = /obj/item/binoculars suit_store = /obj/item/gun/ballistic/automatic/m1garand/republicspride backpack_contents = list( - /obj/item/melee/onehanded/knife/bayonet = 1, \ + /obj/item/melee/onehanded/machete/ncrflag = 1, \ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1, \ /obj/item/ammo_box/magazine/m9mmds = 2, \ /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/mob/living/carbon/human/species_types/supermutant.dm b/code/modules/mob/living/carbon/human/species_types/supermutant.dm index 816d9f2f92..facb5282e7 100644 --- a/code/modules/mob/living/carbon/human/species_types/supermutant.dm +++ b/code/modules/mob/living/carbon/human/species_types/supermutant.dm @@ -11,7 +11,7 @@ // Addself these only ones I know. whitelist = list("ADanimator", "PilotBland", "Cythisia", "Kneesox", "Foxeye", "Oddbomber3768", "Poots13", "Scheveningen", "Akoy") species_traits = list(NOEYES,NO_UNDERWEAR,NOTRANSSTING,NOGENITALS,NOAROUSAL) - inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE, TRAIT_HEAVY_SLEEPER, TRAIT_POOR_AIM, TRAIT_STRONG_GRABBER, TRAIT_QUICK_CARRY, TRAIT_UNARMED_WEAPON, TRAIT_IRONFIST,TRAIT_BIG_LEAGUES) + inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE, TRAIT_MUTATION_STASIS, TRAIT_TOXINLOVER, TRAIT_LONGPORKLOVER, TRAIT_HARD_YARDS, TRAIT_GIANT, TRAIT_STUNIMMUNE, TRAIT_RESISTHEAT, TRAIT_PUSHIMMUNE, TRAIT_TASED_RESISTANCE, TRAIT_HEAVY_SLEEPER, TRAIT_POOR_AIM, TRAIT_STRONG_GRABBER, TRAIT_QUICK_CARRY, TRAIT_UNARMED_WEAPON, TRAIT_IRONFIST,TRAIT_BIG_LEAGUES) inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID) punchstunthreshold = 20 punchdamagelow = 10 @@ -21,7 +21,6 @@ use_skintones = 0 sexes = 0 armor = 60 // Until armor is added in loot pools, then move down to 20-30 - speedmod = 0.75 liked_food = JUNKFOOD | FRIED | RAW //TODO // Disable Prosthetics or make custom ones 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/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index ca34e8db51..7ad81a5e66 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -191,7 +191,8 @@ also: most hitscan weapons have more charge than their normal projectile counter /obj/item/ammo_casing/energy/laser/gatling/hitscan projectile_type = /obj/item/projectile/beam/laser/gatling/hitscan - e_cost = 10 //it's actually 240 shots now, as it fires in a burst of 5 + e_cost = 13.33 //it's actually 240 shots now, as it fires in a burst of 5 + fire_sound = 'sound/f13weapons/multiplas_rifle.ogg' /obj/item/ammo_casing/energy/laser/laer projectile_type = /obj/item/projectile/beam/laser/laer diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index 84b9f9bc3b..0531a76e9e 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -169,7 +169,7 @@ /obj/item/ammo_box/magazine/m473/small name = "4.7mm carbine magazine" - icon_state = "473small" + icon_state = "46x30mmtA" max_ammo = 20 /obj/item/ammo_box/magazine/m473/small/empty 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..acdc09fd12 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -609,7 +609,8 @@ /obj/item/gun/ballistic/automatic/wt550 name = "WT-550" desc = "A compact PDW derived from the G11, firing the same 4.73mm rounds." - item_state = "WT550" + item_state = "m90" + icon_state = "WT550" mag_type = /obj/item/ammo_box/magazine/m473/small burst_size = 1 is_automatic = TRUE @@ -617,8 +618,9 @@ extra_damage = 20 autofire_shot_delay = 1.75 extra_penetration = 0.2 + slowdown = 0.2 w_class = WEIGHT_CLASS_NORMAL - weapon_weight = WEAPON_MEDIUM + weapon_weight = WEAPON_HEAVY spread = 0 fire_delay = 1 can_bayonet = TRUE @@ -720,6 +722,25 @@ can_scope = FALSE fire_sound = 'sound/weapons/Gunshot_large_silenced.ogg' + +//Combat Rifle Keywords: .45 Caliber Rifle, No Attachments (!) +/obj/item/gun/ballistic/automatic/combat + name = "Combat Rifle" + desc = "A .45 semi-automatic combat rifle, produced pre-war for National Guard forces." + icon_state = "combat_rifle" + item_state = "combatrifle" + icon_prefix = "combatrifle" + mag_type = /obj/item/ammo_box/magazine/greasegun + fire_delay = 3 + burst_size = 1 + spread = 1 + extra_damage = 32 + slowdown = 0.3 + can_attachments = FALSE + automatic_burst_overlay = FALSE + semi_auto = TRUE + fire_sound = 'sound/f13weapons/combatrifle.ogg' + //Service rifle Keywords: NCR, 5.56mm, Semi-auto, 20 (10-50) round magazine, 25dmg /obj/item/gun/ballistic/automatic/service name = "service rifle" @@ -1091,24 +1112,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 @@ -1268,7 +1296,7 @@ name = "g11" desc = "This experimental gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The weight and space savings allows for a very high magazine capacity. Chambered in 4.73mm." icon_state = "g11" - item_state = "g11" + item_state = "arg" mag_type = /obj/item/ammo_box/magazine/m473 burst_size = 1 extra_damage = 22.5 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/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 634363007c..297df9c473 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -96,10 +96,9 @@ w_class = WEIGHT_CLASS_HUGE burst_size = 1 automatic = 1 - autofire_shot_delay = 1.25 + autofire_shot_delay = 1 burst_shot_delay = 1 fire_delay = 1 - ranged_attack_speed = CLICK_CD_RAPID spread = 12 weapon_weight = WEAPON_HEAVY extra_penetration = 0 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.dm b/code/modules/projectiles/guns/energy.dm index b6946f3987..da23a42def 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -339,7 +339,7 @@ return TRUE return ..() -/obj/item/gun/energy/AltClick(mob/user) +/obj/item/gun/energy/attack_self(mob/living/user) if (!ishuman(user)) return if (get_dist(src, user)<2) @@ -386,4 +386,4 @@ /obj/item/gun/energy/examine(mob/user) . = ..() if(can_charge == 1) - . += span_notice("Alt-click to eject the battery.") + . += span_notice("Click to eject the battery.") diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index ae3c577ef4..6e4999bf86 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -603,11 +603,10 @@ burst_size = 1 burst_shot_delay = 1 automatic = 1 - autofire_shot_delay = 1.8 + autofire_shot_delay = 1 spread = 6 fire_delay = 1 weapon_weight = WEAPON_HEAVY - fire_sound = 'sound/weapons/laser.ogg' ammo_type = list(/obj/item/ammo_casing/energy/laser/gatling/hitscan) cell_type = /obj/item/stock_parts/cell/ammo/ecp item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND @@ -621,9 +620,6 @@ return ..() -/obj/item/gun/energy/minigun/attack_self(mob/living/user) - return - /obj/item/gun/energy/minigun/dropped(mob/user) . = ..() if(ammo_pack) 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/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index ba9ccf2518..0d25b57e4c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -2,7 +2,7 @@ name = "YK-42b Pulse Rifle" desc = "The YK42B rifle is an electrical pulse weapon that was developed by the Yuma Flats Energy Consortium. It excels in damage against heavily armored opponents, especially power armor." icon_state = "ionrifle" - item_state = null //so the human update icon uses the icon_state instead. + item_state = "ionrifle" can_flashlight = 1 w_class = WEIGHT_CLASS_BULKY flags_1 = CONDUCT_1 diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index 5fb7dcbe15..9b0bc8bed7 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -153,7 +153,6 @@ Uranium, Contaminated if(isliving(target)) var/mob/living/M = target reagents.reaction(M, TOUCH) - reagents.trans_to(M, reagents.total_volume) /obj/item/projectile/bullet/c9mm/incendiary name = "9mm incendiary bullet" diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 9ffbaccba1..05ce2c52b7 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -215,7 +215,7 @@ heavy rifle calibers (12.7, 14mm, 7.62): Uranium, Contaminated, Incin /obj/item/projectile/bullet/a473/incendiary name = "4.73 tracer bullet" - damage = -10 + damage = -8 armour_penetration = 0.1 var/fire_stacks = 3 zone_accuracy_factor = 100 @@ -244,6 +244,7 @@ heavy rifle calibers (12.7, 14mm, 7.62): Uranium, Contaminated, Incin /obj/item/projectile/bullet/a473/explosive name = "4.73 explosive bullet" + damage = -10 /obj/item/projectile/bullet/a473/explosive/on_hit(atom/target, blocked = FALSE) ..() 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..f56ca8abe7 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -345,7 +345,13 @@ /datum/reagent/medicine/styptic_powder/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)) + if(method in list(INGEST, VAPOR, INJECT, TOUCH)) + if (method == TOUCH) + if(show_message) + to_chat(M, "The pink mixture is clotting up, running down your body without effect! It stings and feels slimy!") + M.emote("shiver") + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) + return M.adjustToxLoss(0.5*reac_volume) if(show_message) to_chat(M, "You don't feel so good...") @@ -433,6 +439,7 @@ reagent_state = LIQUID color = "#6D6374" metabolization_rate = 0.4 * REAGENTS_METABOLISM + overdose_threshold = 60 pH = 2.6 value = REAGENT_VALUE_COMMON @@ -444,6 +451,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/armored_medium.dmi b/icons/fallout/clothing/armored_medium.dmi index a79cd7faf5..ad25f14958 100644 Binary files a/icons/fallout/clothing/armored_medium.dmi and b/icons/fallout/clothing/armored_medium.dmi differ diff --git a/icons/fallout/clothing/hats.dmi b/icons/fallout/clothing/hats.dmi index d1817805a6..863733ce9f 100644 Binary files a/icons/fallout/clothing/hats.dmi and b/icons/fallout/clothing/hats.dmi differ diff --git a/icons/fallout/clothing/mantles.dmi b/icons/fallout/clothing/mantles.dmi index 769c631a7f..92489a13d4 100644 Binary files a/icons/fallout/clothing/mantles.dmi and b/icons/fallout/clothing/mantles.dmi differ diff --git a/icons/fallout/clothing/uniforms.dmi b/icons/fallout/clothing/uniforms.dmi index 53b6ed9097..ab42b0263c 100644 Binary files a/icons/fallout/clothing/uniforms.dmi and b/icons/fallout/clothing/uniforms.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/armor_medium.dmi b/icons/fallout/onmob/clothes/armor_medium.dmi index e55c5ed7ef..3034e98f0b 100644 Binary files a/icons/fallout/onmob/clothes/armor_medium.dmi and b/icons/fallout/onmob/clothes/armor_medium.dmi differ diff --git a/icons/fallout/onmob/clothes/head.dmi b/icons/fallout/onmob/clothes/head.dmi index 8a954805dc..a56da8b891 100644 Binary files a/icons/fallout/onmob/clothes/head.dmi and b/icons/fallout/onmob/clothes/head.dmi differ diff --git a/icons/fallout/onmob/clothes/mantle.dmi b/icons/fallout/onmob/clothes/mantle.dmi index 9af42f41a8..41918ff705 100644 Binary files a/icons/fallout/onmob/clothes/mantle.dmi and b/icons/fallout/onmob/clothes/mantle.dmi differ diff --git a/icons/fallout/onmob/clothes/uniform.dmi b/icons/fallout/onmob/clothes/uniform.dmi index e836c8198b..957397db05 100644 Binary files a/icons/fallout/onmob/clothes/uniform.dmi and b/icons/fallout/onmob/clothes/uniform.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index f3bd1abca6..3fcc853ae7 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 9563a8c4b3..267e079447 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index cf940b4e6a..e7cda86ab3 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 2ee9f90c62..34123c581c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 8caf0a860e..5d51b1a99e 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 183721af5d..6a001ebf08 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/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 54769b42c0..62432f25d6 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -9,6 +9,18 @@ subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS cost = 2 +/datum/gear/backpack/beeplushie + name = "Bee Plushie" + path = /obj/item/toy/plush/beeplushie + subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + cost = 2 + +/datum/gear/backpack/snakeplushie + name = "Snake Plushie" + path = /obj/item/toy/plush/snakeplushie + subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + cost = 2 + /datum/gear/backpack/toykatana name = "Toy Katana" path = /obj/item/toy/katana 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..d15dc180fc 100644 --- a/modular_citadel/code/modules/client/loadout/neck.dm +++ b/modular_citadel/code/modules/client/loadout/neck.dm @@ -23,6 +23,62 @@ 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/mantle/legionmantle + name = "Legion mantle" + path = /obj/item/clothing/neck/mantle/legionmantle + cost = 2 + restricted_desc = "Legion Veteran+" + restricted_roles = list("Legion Orator", + "Legion Centurion", + "Legion Veteran Decanus", + "Legion Prime Decanus", + "Legion Recruit Decanus", + "Legion Vexillarius", + "Veteran Legionnaire" + ) + +/datum/gear/neck/mantle/legiontoga + name = "Legion toga" + path = /obj/item/clothing/neck/mantle/legiontoga + cost = 2 + restricted_desc = "Legion Veteran+" + restricted_roles = list("Legion Orator", + "Legion Centurion", + "Legion Veteran Decanus", + "Legion Prime Decanus", + "Legion Recruit Decanus", + "Legion Vexillarius", + "Veteran Legionnaire" + ) /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..ca6d3a8c9d 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,399 @@ /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 + +/datum/gear/uniform/wasteland/warboy + name = "War boy pants" + path = /obj/item/clothing/under/pants/f13/warboy + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/ghoul + name = "Ripped pants" + path = /obj/item/clothing/under/pants/f13/ghoul + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/caravan + name = "Caravanner pants" + path = /obj/item/clothing/under/pants/f13/caravan + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/clothing + name = "Cloth pants" + path = /obj/item/clothing/under/pants/f13/cloth + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/bone/dancer + name = "Bone dancer outfit" + path = /obj/item/clothing/under/f13/bone + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/sorrows + name = "Sorrows garb" + path = /obj/item/clothing/under/f13/sorrows + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/deadhorses + name = "Dead horses garb" + path = /obj/item/clothing/under/f13/deadhorses + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/rustwalker + name = "Rust walkers outfit" + path = /obj/item/clothing/under/f13/rustwalkers + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/whitelegs + name = "White legs outfit" + path = /obj/item/clothing/under/f13/whitelegs + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/masonduds + name = "Vagabond's gang attire" + path = /obj/item/clothing/under/f13/masonduds + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/helenduds + name = "Gambler's gang attire" + path = /datum/gear/uniform/wasteland + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/ikeduds + name = "Gunfighter's gang attire" + path = /obj/item/clothing/under/f13/ikeduds + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/marlowduds + name = "Marlow gang attire" + path = /obj/item/clothing/under/f13/marlowduds + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/locust + name = "Locust Uniform" + path = /obj/item/clothing/under/f13/locust + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/keksweater + name = "Red sweater" + path = /obj/item/clothing/under/f13/keksweater + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/jamrock + name = "Disco shirt and pants" + path = /obj/item/clothing/under/f13/jamrock + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/ravenharness + name = "Raven harness" + path = /obj/item/clothing/under/f13/ravenharness + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/raiderharness + name = "Raider harness" + path = /obj/item/clothing/under/f13/raiderharness + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/worn + name = "Worn outfit" + path = /obj/item/clothing/under/f13/worn + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/merchant + name = "Merchant outfit" + path = /obj/item/clothing/under/f13/merchant + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/caravaneer + name = "Caravaneer outfit" + path = /obj/item/clothing/under/f13/caravaneer + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/mechanic + name = "Worn blue jumpsuit" + path = /obj/item/clothing/under/f13/mechanic + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/mercharm + name = "Merc charmer outfit" + path = /obj/item/clothing/under/f13/merccharm + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/doctor + name = "Doctor fatigues" + path = /obj/item/clothing/under/f13/doctor + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/brahminskin + name = "brahmin skin outfit" + path = /obj/item/clothing/under/f13/brahminm + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/brahminskin/female + name = "female brahmin skin outfit" + path = /obj/item/clothing/under/f13/female/brahmin + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/rag + name = "Torn rags" + path = /obj/item/clothing/under/f13/rag + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/westender + name = "Classic tender outfit" + path = /obj/item/clothing/under/f13/westender + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/bodyguard + name = "Bodyguard outfit" + path = /obj/item/clothing/under/f13/bodyguard + cost = 2 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/formal + name = "Pre-war formal wear" + path = /obj/item/clothing/under/f13/formal + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/spring + name = "Pre-war spring outfit" + path = /obj/item/clothing/under/f13/spring + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/relax + name = "Pre-war relax outfit" + path = /obj/item/clothing/under/f13/relaxedwear + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/bennys + name = "Fancy suit" + path = /obj/item/clothing/under/f13/bennys + cost = 2 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/batter + name = "Worn baseball uniform" + path = /obj/item/clothing/under/f13/batter + cost = 2 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/cowboyt + name = "Dusty prospector outfit" + path = /obj/item/clothing/under/f13/cowboyt + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/police + name = "Police uniform" + path = /obj/item/clothing/under/f13/police + cost = 3 //Its 3 because it has some small armor against damage + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/trooper + name = "State police uniform" + path = /obj/item/clothing/under/f13/police/trooper + cost = 2 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/formal + name = "Police formal uniform" + path = /obj/item/clothing/under/f13/police/formal + cost = 2 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/roving + name = "Roving trader outfit" + path = /obj/item/clothing/under/f13/roving + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/machinist + name = "Workman outfit" + path = /obj/item/clothing/under/f13/machinist + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND + +/datum/gear/uniform/wasteland/sleazeball + name = "Loanshark outfit" + path = /obj/item/clothing/under/f13/sleazeball + cost = 1 + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND diff --git a/sound/f13weapons/combatrifle.ogg b/sound/f13weapons/combatrifle.ogg new file mode 100644 index 0000000000..bd9dde9554 Binary files /dev/null and b/sound/f13weapons/combatrifle.ogg differ