From 84bac7a443f08562386518c345b37746bea38f17 Mon Sep 17 00:00:00 2001 From: MemeSnorfer <116136632+MemeSnorfer@users.noreply.github.com> Date: Sun, 14 Apr 2024 20:34:46 -0700 Subject: [PATCH] Survival Box Changes --- code/modules/clothing/masks/gasmask.dm | 5 +- .../modules/clothing/outfits/ert/indie_ert.dm | 4 + .../modules/clothing/outfits/ert/inteq_ert.dm | 2 + .../clothing/outfits/ert/nanotrasen_ert.dm | 73 +++++-------------- .../clothing/outfits/ert/solgov_ert.dm | 3 +- .../clothing/outfits/ert/syndicate_ert.dm | 3 + .../clothing/outfits/factions/gezena.dm | 6 ++ .../clothing/outfits/factions/inteq.dm | 10 ++- .../clothing/outfits/factions/nanotrasen.dm | 1 - .../clothing/outfits/factions/solgov.dm | 3 +- .../clothing/outfits/factions/syndicate.dm | 20 +---- 11 files changed, 49 insertions(+), 81 deletions(-) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 34e77816c9417..299a713537f53 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -4,7 +4,7 @@ icon_state = "gas_alt" clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_SMALL item_state = "gas_alt" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 @@ -17,7 +17,6 @@ icon_state = "gas_atmos" item_state = "gas_atmos" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 20, "acid" = 10) - w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.001 //cargo cult time, this var does nothing but just in case someone actually makes it do something permeability_coefficient = 0.001 resistance_flags = FIRE_PROOF @@ -90,7 +89,6 @@ icon_state = "clown" item_state = "clown_hat" dye_color = "clown" - w_class = WEIGHT_CLASS_SMALL flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) @@ -146,7 +144,6 @@ clothing_flags = ALLOWINTERNALS icon_state = "mime" item_state = "mime" - w_class = WEIGHT_CLASS_SMALL flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE actions_types = list(/datum/action/item_action/adjust) diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm index e45f0895d0f4a..9f5579415a963 100644 --- a/code/modules/clothing/outfits/ert/indie_ert.dm +++ b/code/modules/clothing/outfits/ert/indie_ert.dm @@ -13,6 +13,7 @@ back = /obj/item/storage/backpack/security belt = /obj/item/storage/belt/security/full id = /obj/item/card/id + box = /obj/item/storage/box/survival/security /datum/outfit/job/independent/ert/post_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source) . = ..() @@ -36,6 +37,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/paramedic back = /obj/item/storage/backpack/medic belt = /obj/item/storage/belt/medical/webbing/paramedic + box = /obj/item/storage/box/survival/medical /datum/outfit/job/independent/ert/firefighter name = "ERT - Independent Firefighter (Standard)" @@ -51,6 +53,7 @@ shoes = /obj/item/clothing/shoes/workboots gloves = /obj/item/clothing/gloves/color/black back = /obj/item/tank/internals/oxygen/red + box = /obj/item/storage/box/survival/engineer l_pocket = /obj/item/crowbar/red r_pocket = /obj/item/radio @@ -65,6 +68,7 @@ gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/tank/internals/emergency_oxygen + box = /obj/item/storage/box/survival/medical l_pocket = /obj/item/extinguisher/mini diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm index c5ef123a21cfc..b6a09e70e6035 100644 --- a/code/modules/clothing/outfits/ert/inteq_ert.dm +++ b/code/modules/clothing/outfits/ert/inteq_ert.dm @@ -13,6 +13,7 @@ id = /obj/item/card/id belt = /obj/item/storage/belt/security/webbing/inteq/skm back = /obj/item/storage/backpack/fireproof + box = /obj/item/storage/box/survival/security l_pocket = /obj/item/kitchen/knife/combat r_pocket = /obj/item/flashlight/seclite @@ -36,6 +37,7 @@ uniform = /obj/item/clothing/under/syndicate/inteq/corpsman belt = /obj/item/storage/belt/medical/webbing/paramedic suit_store = null + box = /obj/item/storage/box/survival/medical l_pocket = /obj/item/healthanalyzer diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm index 7e39f0b2f32ae..82bd4db845587 100644 --- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm +++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm @@ -7,6 +7,7 @@ shoes = /obj/item/clothing/shoes/combat/swat gloves = /obj/item/clothing/gloves/combat ears = /obj/item/radio/headset/headset_cent/alt + box = /obj/item/storage/box/survival/security /datum/outfit/centcom/ert/post_equip(mob/living/carbon/human/human, visualsOnly = FALSE) if(visualsOnly) @@ -27,8 +28,7 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses back = /obj/item/storage/backpack/ert belt = /obj/item/storage/belt/security/full - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/melee/baton/loaded=1) + backpack_contents = list(/obj/item/melee/baton/loaded=1) l_pocket = /obj/item/switchblade /datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -45,9 +45,7 @@ mask = /obj/item/clothing/mask/gas/sechailer/swat glasses = /obj/item/clothing/glasses/thermal/eyepatch - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/gun/energy/pulse/pistol/loyalpin=1) + backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/gun/energy/pulse/pistol/loyalpin=1) l_pocket = /obj/item/melee/transforming/energy/sword/saber /datum/outfit/centcom/ert/security @@ -60,9 +58,7 @@ gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack/ert/security belt = /obj/item/storage/belt/security/full - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/storage/box/handcuffs=1, - /obj/item/melee/baton/loaded=1) + backpack_contents = list(/obj/item/storage/box/handcuffs=1, /obj/item/melee/baton/loaded=1) /datum/outfit/centcom/ert/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -79,9 +75,7 @@ suit_store = /obj/item/gun/energy/pulse/carbine/loyalpin mask = /obj/item/clothing/mask/gas/sechailer/swat - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/storage/box/handcuffs=1,\ - /obj/item/melee/baton/loaded=1) + backpack_contents = list(/obj/item/storage/box/handcuffs=1, /obj/item/melee/baton/loaded=1) /datum/outfit/centcom/ert/medic name = "ERT Medic" @@ -93,10 +87,8 @@ back = /obj/item/storage/backpack/ert/medical belt = /obj/item/storage/belt/medical r_hand = /obj/item/storage/firstaid/regular - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/reagent_containers/hypospray/combat=1,\ - /obj/item/gun/medbeam=1) + box = /obj/item/storage/box/survival/medical + backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/reagent_containers/hypospray/combat=1, /obj/item/gun/medbeam=1) /datum/outfit/centcom/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -112,11 +104,7 @@ name = "ERT Medic - High Alert" mask = /obj/item/clothing/mask/gas/sechailer/swat - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/gun/energy/pulse/pistol/loyalpin=1,\ - /obj/item/reagent_containers/hypospray/combat/nanites=1,\ - /obj/item/gun/medbeam=1) + backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/gun/energy/pulse/pistol/loyalpin=1, /obj/item/reagent_containers/hypospray/combat/nanites=1, /obj/item/gun/medbeam=1) /datum/outfit/centcom/ert/engineer name = "ERT Engineer" @@ -129,9 +117,8 @@ belt = /obj/item/storage/belt/utility/full l_pocket = /obj/item/rcd_ammo/large r_hand = /obj/item/storage/firstaid/regular - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/construction/rcd/loaded=1) + box = /obj/item/storage/box/survival/engineer + backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/construction/rcd/loaded=1) /datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -148,10 +135,7 @@ name = "ERT Engineer - High Alert" mask = /obj/item/clothing/mask/gas/sechailer/swat - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/gun/energy/pulse/pistol/loyalpin=1,\ - /obj/item/construction/rcd/combat=1) + backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/gun/energy/pulse/pistol/loyalpin=1, /obj/item/construction/rcd/combat=1) // official @@ -199,12 +183,7 @@ r_pocket = /obj/item/grenade/chem_grenade/cleaner l_pocket = /obj/item/grenade/chem_grenade/cleaner l_hand = /obj/item/storage/bag/trash/bluespace - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/storage/box/lights/mixed=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/mop/advanced=1,\ - /obj/item/reagent_containers/glass/bucket=1,\ - /obj/item/grenade/clusterbuster/cleaner=1) + backpack_contents = list(/obj/item/storage/box/lights/mixed=1, /obj/item/melee/baton/loaded=1, /obj/item/mop/advanced=1, /obj/item/reagent_containers/glass/bucket=1, /obj/item/grenade/clusterbuster/cleaner=1) /datum/outfit/centcom/ert/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -221,10 +200,7 @@ mask = /obj/item/clothing/mask/gas/sechailer/swat r_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor - backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/storage/box/lights/mixed=1,\ - /obj/item/melee/baton/loaded=1,\ - /obj/item/grenade/clusterbuster/cleaner=3) + backpack_contents = list(/obj/item/storage/box/lights/mixed=1, /obj/item/melee/baton/loaded=1, /obj/item/grenade/clusterbuster/cleaner=3) /datum/outfit/centcom/centcom_intern name = "CentCom Intern" @@ -240,7 +216,6 @@ l_pocket = /obj/item/ammo_box/magazine/illestren_a850r r_pocket = /obj/item/ammo_box/magazine/illestren_a850r id = /obj/item/card/id/centcom - backpack_contents = list(/obj/item/storage/box/survival = 1) /datum/outfit/centcom/centcom_intern/unarmed name = "CentCom Intern (Unarmed)" belt = null @@ -281,10 +256,7 @@ id = /obj/item/card/id/ert suit = /obj/item/clothing/suit/armor/vest/marine back = /obj/item/storage/backpack/ert - backpack_contents = list( - /obj/item/storage/box/survival/engineer/radio = 1, - /obj/item/gun_voucher/nanotrasen = 1 -) + backpack_contents = list(/obj/item/gun_voucher/nanotrasen = 1) belt = /obj/item/storage/belt/military/assault glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch l_pocket = /obj/item/kitchen/knife/combat @@ -331,15 +303,10 @@ back = /obj/item/storage/backpack/ert/medical l_pocket = /obj/item/healthanalyzer head = /obj/item/clothing/head/helmet/marine/medic - backpack_contents = list( - /obj/item/storage/box/survival/engineer/radio = 1, - /obj/item/gun_voucher/nanotrasen = 1, - /obj/item/reagent_containers/hypospray/combat = 1, - /obj/item/storage/firstaid/regular = 1, - /obj/item/storage/firstaid/advanced = 1 -) + backpack_contents = list(/obj/item/gun_voucher/nanotrasen = 1, /obj/item/reagent_containers/hypospray/combat = 1, /obj/item/storage/firstaid/regular = 1, /obj/item/storage/firstaid/advanced = 1) belt = /obj/item/storage/belt/medical/paramedic glasses = /obj/item/clothing/glasses/hud/health/sunglasses + box = /obj/item/storage/box/survival/medical /datum/outfit/centcom/ert/marine/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -358,15 +325,12 @@ suit = /obj/item/clothing/suit/armor/vest/marine/medium head = /obj/item/clothing/head/helmet/marine/engineer back = /obj/item/storage/backpack/ert/engineer - backpack_contents = list( - /obj/item/storage/box/survival/engineer/radio = 1, - /obj/item/gun_voucher/nanotrasen = 1, - /obj/item/rcd_ammo/large = 2, - ) + backpack_contents = list(/obj/item/gun_voucher/nanotrasen = 1, /obj/item/rcd_ammo/large = 2) r_hand = /obj/item/deployable_turret_folded uniform = /obj/item/clothing/under/rank/security/officer/military/eng belt = /obj/item/storage/belt/utility/full/ert glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses + box = /obj/item/storage/box/survival/engineer /datum/outfit/centcom/ert/marine/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -397,7 +361,6 @@ shoes = /obj/item/clothing/shoes/jackboots back = /obj/item/storage/backpack/ert/security - box = /obj/item/storage/box/survival/security l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/kitchen/knife/combat diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm index bc09a74c17860..f5839ba5989c9 100644 --- a/code/modules/clothing/outfits/ert/solgov_ert.dm +++ b/code/modules/clothing/outfits/ert/solgov_ert.dm @@ -13,7 +13,7 @@ shoes = /obj/item/clothing/shoes/workboots back = /obj/item/storage/backpack - box = /obj/item/storage/box/survival + box = /obj/item/storage/box/survival/security l_hand = /obj/item/energyhalberd @@ -29,6 +29,7 @@ head = /obj/item/clothing/head/solgov gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/laceup + box = /obj/item/storage/box/survival suit = null suit_store = null mask = null diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm index 99d4f2e5d1295..cab3d8d0f72e1 100644 --- a/code/modules/clothing/outfits/ert/syndicate_ert.dm +++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm @@ -13,6 +13,7 @@ head = /obj/item/clothing/head/helmet/operator back = /obj/item/storage/backpack/security belt = /obj/item/storage/belt/military/c20r + box = /obj/item/storage/box/survival/syndie r_pocket = /obj/item/kitchen/knife/combat l_pocket = /obj/item/grenade/frag @@ -59,6 +60,7 @@ glasses = /obj/item/clothing/glasses/hud/health/sunglasses gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil suit_store = /obj/item/gun/ballistic/automatic/pistol + box = /obj/item/storage/box/survival/medical l_pocket = /obj/item/radio @@ -136,6 +138,7 @@ l_pocket = /obj/item/kitchen/knife/combat/survival r_pocket = /obj/item/pinpointer/crew accessory = /obj/item/clothing/accessory/holster/marine + box = /obj/item/storage/box/survival/medical backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/radio=1) diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm index f34353c0e2dfc..842f1542ef349 100644 --- a/code/modules/clothing/outfits/factions/gezena.dm +++ b/code/modules/clothing/outfits/factions/gezena.dm @@ -26,6 +26,7 @@ uniform = /obj/item/clothing/under/gezena shoes = /obj/item/clothing/shoes/combat/gezena neck = /obj/item/clothing/neck/cloak/gezena/engi + box = /obj/item/storage/box/survival/engineer /datum/outfit/job/gezena/doctor name = "PGF - Navy Doctor" @@ -35,6 +36,7 @@ uniform = /obj/item/clothing/under/gezena shoes = /obj/item/clothing/shoes/combat/gezena neck = /obj/item/clothing/neck/cloak/gezena/med + box = /obj/item/storage/box/survival/medical /datum/outfit/job/gezena/security name = "PGF - Marine" @@ -44,6 +46,7 @@ uniform = /obj/item/clothing/under/gezena/marine shoes = /obj/item/clothing/shoes/combat/gezena neck = /obj/item/clothing/neck/cloak/gezena + box = /obj/item/storage/box/survival/security /datum/outfit/job/gezena/hos name = "PGF - Marine Sergeant" @@ -53,6 +56,7 @@ uniform = /obj/item/clothing/under/gezena/marine shoes = /obj/item/clothing/shoes/combat/gezena neck = /obj/item/clothing/neck/cloak/gezena/captain + box = /obj/item/storage/box/survival/security /datum/outfit/job/gezena/captain name = "PGF - Captain" @@ -62,6 +66,7 @@ uniform = /obj/item/clothing/under/gezena/captain shoes = /obj/item/clothing/shoes/combat/gezena neck = /obj/item/clothing/neck/cloak/gezena/captain + box = /obj/item/storage/box/survival/security //Adminspawn Roles (for events): @@ -143,6 +148,7 @@ shoes = /obj/item/clothing/shoes/combat/gezena neck = /obj/item/clothing/neck/cloak/gezena/med r_hand = /obj/item/gun/energy/kalix/pgf + box = /obj/item/storage/box/survival/medical /datum/outfit/job/gezena/captain/geared diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index 14845b52e5dd9..641462a251b60 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -38,6 +38,7 @@ l_pocket = /obj/item/restraints/handcuffs jobtype = /datum/job/captain id = /obj/item/card/id/gold + box = /obj/item/storage/box/survival/security backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) @@ -88,10 +89,10 @@ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat - belt = /obj/item/storage/belt/utility/full + belt = /obj/item/storage/belt/utility/chief/full + box = /obj/item/storage/box/survival/engineer id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/utility/chief/full courierbag = /obj/item/storage/backpack/messenger/inteq @@ -110,6 +111,7 @@ shoes = /obj/item/clothing/shoes/combat belt = /obj/item/storage/belt/medical/webbing/paramedic ears = /obj/item/radio/headset/headset_medsec/alt + box = /obj/item/storage/box/survival/medical suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/roller=1) @@ -138,6 +140,7 @@ shoes = /obj/item/clothing/shoes/combat glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq gloves = /obj/item/clothing/gloves/combat + box = /obj/item/storage/box/survival/security backpack = /obj/item/storage/backpack/messenger/inteq satchel = /obj/item/storage/backpack/messenger/inteq @@ -179,6 +182,7 @@ shoes = /obj/item/clothing/shoes/combat belt = /obj/item/storage/belt/utility/full/engi r_pocket = /obj/item/t_scanner + box = /obj/item/storage/box/survival/engineer //wardens @@ -197,6 +201,7 @@ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat + box = /obj/item/storage/box/survival/security suit_store = null courierbag = /obj/item/storage/backpack/messenger/inteq @@ -218,6 +223,7 @@ alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman dcoat = /obj/item/clothing/suit/armor/hos/inteq r_pocket = /obj/item/pda/medical + box = /obj/item/storage/box/survival/medical chameleon_extras = null diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm index 28ff486e4dc6d..20f8b476361c6 100644 --- a/code/modules/clothing/outfits/factions/nanotrasen.dm +++ b/code/modules/clothing/outfits/factions/nanotrasen.dm @@ -411,7 +411,6 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med courierbag = /obj/item/storage/backpack/messenger/med - box = /obj/item/storage/box/survival/medical // Cargo Tech diff --git a/code/modules/clothing/outfits/factions/solgov.dm b/code/modules/clothing/outfits/factions/solgov.dm index 33463c4985811..e54c926611a54 100644 --- a/code/modules/clothing/outfits/factions/solgov.dm +++ b/code/modules/clothing/outfits/factions/solgov.dm @@ -74,7 +74,7 @@ l_pocket = null shoes = /obj/item/clothing/shoes/workboots back = /obj/item/storage/backpack - box = /obj/item/storage/box/survival + box = /obj/item/storage/box/survival/security backpack_contents = list(/obj/item/crowbar/power) /datum/outfit/job/solgov/representative @@ -174,6 +174,7 @@ shoes = /obj/item/clothing/shoes/laceup id = /obj/item/card/id l_hand = /obj/item/clipboard + box = /obj/item/storage/box/survival/medical backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 5eb0b9e5bac8a..fc820ae837cf8 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -50,8 +50,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/assistant/gorlex name = "Syndicate - Junior Agent (Gorlex Marauders)" @@ -92,8 +90,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/assistant/twink/post_equip(mob/living/carbon/human/H) . = ..() @@ -207,8 +203,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/bartender/twink/post_equip(mob/living/carbon/human/H) . = ..() assign_codename(H) @@ -261,8 +255,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/sec courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/captain/aclf name = "Captain (ACLF)" @@ -549,8 +541,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/hos/twink/post_equip(mob/living/carbon/human/H) . = ..() assign_codename(H) @@ -603,6 +593,7 @@ shoes = /obj/item/clothing/shoes/sneakers/white alt_suit = /obj/item/clothing/suit/apron/surgical l_hand = /obj/item/storage/firstaid/medical + box = /obj/item/storage/box/survival/medical /datum/outfit/job/syndicate/doctor/suns name = "Syndicate - Medical Doctor (SUNS)" @@ -635,7 +626,7 @@ r_pocket = /obj/item/kitchen/knife/combat/survival back = /obj/item/storage/backpack/duffelbag/syndie/med id = /obj/item/card/id/syndicate_command/crew_id - backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,) + backpack_contents = list(/obj/item/storage/firstaid/medical,) //paramedics @@ -696,8 +687,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/paramedic/twink/post_equip(mob/living/carbon/human/H) . = ..() assign_codename(H) @@ -716,6 +705,7 @@ alt_uniform = null l_hand = /obj/item/clipboard pda_slot = ITEM_SLOT_BELT + box = /obj/item/storage/box/survival/medical /datum/outfit/job/syndicate/psychologist/suns name = "Syndicate - Psychologist (SUNS)" @@ -848,8 +838,6 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie courierbag = /obj/item/storage/backpack/messenger/sec - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/security/twink/post_equip(mob/living/carbon/human/H) . = ..() assign_codename(H) @@ -1003,8 +991,6 @@ r_pocket = null implants = list(/obj/item/implant/weapons_auth) - box = /obj/item/storage/box/survival/syndie - /datum/outfit/job/syndicate/engineer/twink/post_equip(mob/living/carbon/human/H) . = ..() assign_codename(H)