From 49984b4a5e1a413d71362492109bd6f5e73b9269 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Fri, 27 Sep 2024 12:26:19 +0200 Subject: [PATCH 01/17] Renaming of pocket vars and documenting outfit vars --- code/__DEFINES/equipment.dm | 27 +++-- code/_onclick/hud/human.dm | 20 ++-- .../loadout_items/SOM/suit_storage/veteran.dm | 4 +- .../campaign/loadout_items/_TGMC/belt.dm | 4 +- .../loadout_items/_TGMC/suit_storage.dm | 4 +- .../_TGMC/suit_storage/squad_leader.dm | 4 +- .../gamemodes/campaign/outfit_holder.dm | 4 +- .../campaign/rewards/campaign_asset_jobs.dm | 22 ++-- code/datums/jobs/job/clf.dm | 20 ++-- code/datums/jobs/job/deathsquad.dm | 12 +- code/datums/jobs/job/erp.dm | 10 +- code/datums/jobs/job/freelancers.dm | 22 ++-- code/datums/jobs/job/icc.dm | 28 ++--- code/datums/jobs/job/imperium.dm | 20 ++-- code/datums/jobs/job/other.dm | 8 +- code/datums/jobs/job/pmc.dm | 16 +-- code/datums/jobs/job/retired.dm | 4 +- code/datums/jobs/job/sectoid.dm | 4 +- code/datums/jobs/job/shipside.dm | 56 ++++----- code/datums/jobs/job/skeleton.dm | 8 +- code/datums/jobs/job/sons_of_mars_ert.dm | 24 ++-- code/datums/jobs/job/sons_of_mars_shipside.dm | 14 +-- code/datums/jobs/job/special_forces.dm | 20 ++-- code/datums/jobs/job/survivor.dm | 26 ++-- code/datums/jobs/job/upp.dm | 16 +-- code/datums/jobs/job/upp_commando.dm | 12 +- code/datums/jobs/job/vsd.dm | 38 +++--- code/datums/outfit.dm | 112 +++++++++--------- code/datums/quick_load_beginners.dm | 24 ++-- code/datums/quick_load_civil_war.dm | 4 +- code/datums/quick_load_outfits.dm | 74 +++++------- code/datums/quick_load_robots.dm | 52 ++++---- code/game/area/bigred.dm | 2 +- code/game/objects/items.dm | 8 +- code/game/objects/machinery/buttons.dm | 3 +- code/modules/admin/topic.dm | 4 +- code/modules/admin/verbs/selectequipment.dm | 2 +- code/modules/clothing/outfits/vv_outfit.dm | 4 +- code/modules/logging/log_category.dm | 4 +- code/modules/logging/log_entry.dm | 20 ++-- code/modules/logging/log_holder.dm | 10 +- code/modules/mob/inventory.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 4 +- .../mob/living/carbon/human/inventory.dm | 40 +++---- .../mob/living/carbon/human/update_icons.dm | 12 +- code/modules/mob/living/carbon/inventory.dm | 32 +++++ code/modules/mob/mob.dm | 27 +---- 47 files changed, 438 insertions(+), 449 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index a9172242e12bf..9e5b88be1c4a6 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -227,6 +227,7 @@ #define ITEM_SLOT_L_HAND (1<<15) //left hand #define ITEM_SLOT_R_HAND (1<<16) //right hand + ///Inventory slot bits to plain english strings GLOBAL_LIST_INIT(inventory_slots_to_string, list( "[ITEM_SLOT_OCLOTHING]" = "Suit", @@ -265,23 +266,23 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define SLOT_BACK 11 #define SLOT_L_STORE 12 #define SLOT_R_STORE 13 -#define SLOT_ACCESSORY 14 +#define SLOT_ACCESSORY 14//!!! this is webbing #define SLOT_S_STORE 15 #define SLOT_L_HAND 16 #define SLOT_R_HAND 17 #define SLOT_HANDCUFFED 18 -#define SLOT_IN_BOOT 19 -#define SLOT_IN_BACKPACK 20 -#define SLOT_IN_SUIT 21 -#define SLOT_IN_ACCESSORY 23 -#define SLOT_IN_HOLSTER 24 -#define SLOT_IN_B_HOLSTER 25 -#define SLOT_IN_S_HOLSTER 26 -#define SLOT_IN_STORAGE 27 -#define SLOT_IN_L_POUCH 28 -#define SLOT_IN_R_POUCH 29 -#define SLOT_IN_HEAD 30 -#define SLOT_IN_BELT 31 +#define SLOT_IN_BOOT 19//!! +#define SLOT_IN_BACKPACK 20//!! +#define SLOT_IN_SUIT 21//!! +#define SLOT_IN_ACCESSORY 23//!! +#define SLOT_IN_HOLSTER 24// !! +#define SLOT_IN_B_HOLSTER 25// !! +#define SLOT_IN_S_HOLSTER 26// !! +#define SLOT_IN_STORAGE 27// !! +#define SLOT_IN_L_POUCH 28// !! +#define SLOT_IN_R_POUCH 29// !! +#define SLOT_IN_HEAD 30// !! +#define SLOT_IN_BELT 31// !! //================================================= diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 7044e233df29a..f1e2a886ab4ec 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -270,12 +270,12 @@ if(H.back) H.back.screen_loc = ui_back screenmob.client.screen += H.back - if(H.l_store) - H.l_store.screen_loc = ui_storage1 - screenmob.client.screen += H.l_store - if(H.r_store) - H.r_store.screen_loc = ui_storage2 - screenmob.client.screen += H.r_store + if(H.l_pocket) + H.l_pocket.screen_loc = ui_storage1 + screenmob.client.screen += H.l_pocket + if(H.r_pocket) + H.r_pocket.screen_loc = ui_storage2 + screenmob.client.screen += H.r_pocket else if(H.s_store) screenmob.client.screen -= H.s_store @@ -285,10 +285,10 @@ screenmob.client.screen -= H.belt if(H.back) screenmob.client.screen -= H.back - if(H.l_store) - screenmob.client.screen -= H.l_store - if(H.r_store) - screenmob.client.screen -= H.r_store + if(H.l_pocket) + screenmob.client.screen -= H.l_pocket + if(H.r_pocket) + screenmob.client.screen -= H.r_pocket if(hud_version != HUD_STYLE_NOHUD) if(H.r_hand) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm index 8da166b605b90..5680dcf750922 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm @@ -310,11 +310,11 @@ wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) - if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_L_POUCH) - if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_R_POUCH) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm index 173cbfb039883..7846620c80474 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm @@ -80,13 +80,13 @@ /datum/loadout_item/belt/smg_holster/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(wearer), SLOT_IN_HOLSTER) var/ammo_type = /obj/item/ammo_magazine/smg/m25 - if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) if(wearer.skills.getRating(SKILL_SMGS) >= SKILL_SMGS_TRAINED) ammo_type = /obj/item/ammo_magazine/smg/m25/ap - if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm index 075ed95a295e2..16763361215f4 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm @@ -51,11 +51,11 @@ wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) - if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) - if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm index add101f97b6b2..eb5a4ae708439 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm @@ -246,11 +246,11 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - if(loadout.l_store == /obj/item/storage/pouch/magazine/large) + if(loadout.l_pocket == /obj/item/storage/pouch/magazine/large) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_L_POUCH) - if(loadout.r_store == /obj/item/storage/pouch/magazine/large) + if(loadout.r_pocket == /obj/item/storage/pouch/magazine/large) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_R_POUCH) diff --git a/code/datums/gamemodes/campaign/outfit_holder.dm b/code/datums/gamemodes/campaign/outfit_holder.dm index 97f6233f440c7..062e08887ef3b 100644 --- a/code/datums/gamemodes/campaign/outfit_holder.dm +++ b/code/datums/gamemodes/campaign/outfit_holder.dm @@ -114,9 +114,9 @@ if(ITEM_SLOT_BACK) loadout.back = new_item?.item_typepath if(ITEM_SLOT_R_POCKET) - loadout.r_store = new_item?.item_typepath + loadout.r_pocket = new_item?.item_typepath if(ITEM_SLOT_L_POCKET) - loadout.l_store = new_item?.item_typepath + loadout.l_pocket = new_item?.item_typepath if(ITEM_SLOT_SUITSTORE) loadout.suit_store = new_item?.item_typepath else diff --git a/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm b/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm index 6608a06b1f474..a338876517a22 100644 --- a/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm +++ b/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm @@ -42,8 +42,8 @@ What you lack in equipment and military training you make up in bravery and conv wear_suit = /obj/item/clothing/suit/storage/faction/militia gloves = /obj/item/clothing/gloves/black head = /obj/item/clothing/head/strawhat - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pill_bottle/zoom + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pill_bottle/zoom back = /obj/item/storage/backpack/lightpack @@ -211,7 +211,7 @@ What you lack in equipment and military training you make up in bravery and conv gloves = /obj/item/clothing/gloves/black glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/weapon/gun/smg/skorpion - l_store = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/medical_injectors/medic back = /obj/item/storage/backpack/lightpack @@ -230,7 +230,7 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/som/militia/medic/uzi suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness - r_store = /obj/item/storage/holster/flarepouch + r_pocket = /obj/item/storage/holster/flarepouch /datum/outfit/job/som/militia/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -252,7 +252,7 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/som/militia/medic/skorpion suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - r_store = /obj/item/storage/holster/flarepouch + r_pocket = /obj/item/storage/holster/flarepouch /datum/outfit/job/som/militia/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -274,7 +274,7 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/som/militia/medic/paladin suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness - r_store = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/shotgun /datum/outfit/job/som/militia/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -314,8 +314,8 @@ What you lack in equipment and military training you make up in bravery and conv gloves = /obj/item/clothing/gloves/black head = /obj/item/clothing/head/militia glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/pistol - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack @@ -629,8 +629,8 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) w_uniform = /obj/item/clothing/under/marine/robotic/black_vest wear_suit = /obj/item/clothing/suit/modular/robot/heavy/tyr head = /obj/item/clothing/head/modular/robot/heavy/tyr - r_store = /obj/item/storage/pouch/pistol - l_store = /obj/item/storage/pouch/grenade/combat_patrol + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/satchel belt = /obj/item/storage/belt/marine/te_cells @@ -699,7 +699,7 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/tgmc/campaign_robot/jetpack wear_suit = /obj/item/clothing/suit/modular/robot/heavy/shield - r_store = /obj/item/storage/pouch/magazine/large + r_pocket = /obj/item/storage/pouch/magazine/large suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/mag_harness back = /obj/item/jetpack_marine/heavy diff --git a/code/datums/jobs/job/clf.dm b/code/datums/jobs/job/clf.dm index 729ed44aa5d3e..2e4b370b2ace3 100644 --- a/code/datums/jobs/job/clf.dm +++ b/code/datums/jobs/job/clf.dm @@ -33,8 +33,8 @@ wear_suit = /obj/item/clothing/suit/storage/faction/militia gloves = /obj/item/clothing/gloves/black head = /obj/item/clothing/head/strawhat - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pill_bottle/zoom + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pill_bottle/zoom back = /obj/item/storage/backpack/lightpack @@ -207,7 +207,7 @@ gloves = /obj/item/clothing/gloves/black glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/weapon/gun/smg/skorpion - l_store = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/medical_injectors/medic back = /obj/item/storage/backpack/lightpack @@ -226,7 +226,7 @@ /datum/outfit/job/clf/medic/uzi suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness - r_store = /obj/item/storage/holster/flarepouch + r_pocket = /obj/item/storage/holster/flarepouch /datum/outfit/job/clf/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -248,7 +248,7 @@ /datum/outfit/job/clf/medic/skorpion suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - r_store = /obj/item/storage/holster/flarepouch + r_pocket = /obj/item/storage/holster/flarepouch /datum/outfit/job/clf/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -270,7 +270,7 @@ /datum/outfit/job/clf/medic/paladin suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness - r_store = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/shotgun /datum/outfit/job/clf/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -309,8 +309,8 @@ wear_suit = /obj/item/clothing/suit/storage/faction/militia gloves = /obj/item/clothing/gloves/black head = /obj/item/clothing/head/helmet/marine - r_store = /obj/item/storage/pouch/pistol - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid /datum/outfit/job/clf/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -413,8 +413,8 @@ gloves = /obj/item/clothing/gloves/black head = /obj/item/clothing/head/militia glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/pistol - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack diff --git a/code/datums/jobs/job/deathsquad.dm b/code/datums/jobs/job/deathsquad.dm index 8252cc68cbffe..149c1b88d49f9 100644 --- a/code/datums/jobs/job/deathsquad.dm +++ b/code/datums/jobs/job/deathsquad.dm @@ -25,8 +25,8 @@ mask = /obj/item/clothing/mask/gas/pmc glasses = /obj/item/clothing/glasses/night/m42_night_goggles suit_store = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/deathsquad - r_store = /obj/item/storage/pouch/medkit - l_store = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/medkit + l_pocket = /obj/item/storage/pouch/grenade back = /obj/item/storage/backpack/commando implants = list(/obj/item/implant/suicide_dust) @@ -98,8 +98,8 @@ mask = /obj/item/clothing/mask/gas/pmc glasses = /obj/item/clothing/glasses/night/m42_night_goggles suit_store = /obj/item/weapon/gun/launcher/rocket/m57a4/deathsquad - r_store = /obj/item/storage/pouch/medkit - l_store = /obj/item/storage/pouch/explosive + r_pocket = /obj/item/storage/pouch/medkit + l_pocket = /obj/item/storage/pouch/explosive back = /obj/item/storage/backpack/commando implants = list(/obj/item/implant/suicide_dust) @@ -169,8 +169,8 @@ head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando glasses = /obj/item/clothing/glasses/night/m42_night_goggles suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/deathsquad - r_store = /obj/item/storage/pouch/medkit - l_store = /obj/item/storage/pouch/magazine/drum + r_pocket = /obj/item/storage/pouch/medkit + l_pocket = /obj/item/storage/pouch/magazine/drum back = /obj/item/storage/backpack/commando implants = list(/obj/item/implant/suicide_dust) diff --git a/code/datums/jobs/job/erp.dm b/code/datums/jobs/job/erp.dm index 7e1e363ff1942..d72ea5914fb11 100644 --- a/code/datums/jobs/job/erp.dm +++ b/code/datums/jobs/job/erp.dm @@ -21,8 +21,8 @@ w_uniform = /obj/item/clothing/under/rank/clown/erp wear_suit = /obj/item/clothing/suit/modular/rownin/erp head = /obj/item/clothing/head/tgmcberet/red2/erp - l_store = /obj/item/storage/pouch/medkit/firstaid - r_store = /obj/item/storage/holster/flarepouch/full + l_pocket = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/holster/flarepouch/full belt = /obj/item/storage/belt/marine suit_store = /obj/item/weapon/gun/rifle/standard_carbine/beginner @@ -97,8 +97,8 @@ name = "ERP Boo-boo kisser" jobtype = /datum/job/erp/boobookisser - l_store = /obj/item/storage/pouch/medkit/medic - r_store = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/medkit/medic + r_pocket = /obj/item/storage/pouch/medical_injectors/medic belt = /obj/item/storage/belt/lifesaver/full /datum/outfit/job/erp/boobookisser/post_equip(mob/living/carbon/human/H, visualsOnly) @@ -128,7 +128,7 @@ belt = /obj/item/storage/belt/grenade suit_store = /obj/item/weapon/gun/grenade_launcher/multinade_launcher/erp - r_store = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/erp/piethrower/post_equip(mob/living/carbon/human/H, visualsOnly) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) diff --git a/code/datums/jobs/job/freelancers.dm b/code/datums/jobs/job/freelancers.dm index 159b6b87618b0..0b3d9eb733dad 100644 --- a/code/datums/jobs/job/freelancers.dm +++ b/code/datums/jobs/job/freelancers.dm @@ -22,7 +22,7 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/frelancer back = /obj/item/storage/backpack/lightpack - l_store = /obj/item/storage/pouch/medkit/firstaid + l_pocket = /obj/item/storage/pouch/medkit/firstaid /datum/outfit/job/freelancer/post_equip(mob/living/carbon/human/H, visualsOnly) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) @@ -61,7 +61,7 @@ /datum/outfit/job/freelancer/standard/one suit_store = /obj/item/weapon/gun/rifle/m16/freelancer - r_store = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/shotgun /datum/outfit/job/freelancer/standard/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -86,7 +86,7 @@ ///m16 ugl /datum/outfit/job/freelancer/standard/two suit_store = /obj/item/weapon/gun/rifle/m16/ugl - r_store = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/freelancer/standard/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -113,7 +113,7 @@ ///tx11 /datum/outfit/job/freelancer/standard/three suit_store = /obj/item/weapon/gun/rifle/tx11/freelancerone - r_store = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/freelancer/standard/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -152,8 +152,8 @@ wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/medic glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/weapon/gun/rifle/famas/freelancermedic - r_store = /obj/item/storage/pouch/medical_injectors/medic - l_store = /obj/item/storage/pouch/magazine/large + r_pocket = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/magazine/large /datum/outfit/job/freelancer/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -188,7 +188,7 @@ /datum/outfit/job/freelancer/grenadier/one w_uniform = /obj/item/clothing/under/marine/veteran/freelancer/veteran suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer - r_store = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/freelancer/grenadier/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -245,7 +245,7 @@ ///actual grenadier /datum/outfit/job/freelancer/grenadier/three suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer - r_store = /obj/item/storage/pouch/magazine/large + r_pocket = /obj/item/storage/pouch/magazine/large /datum/outfit/job/freelancer/grenadier/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -298,7 +298,7 @@ belt = /obj/item/storage/belt/grenade/b17 wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader suit_store = /obj/item/weapon/gun/rifle/m16/freelancer - r_store = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/shotgun /datum/outfit/job/freelancer/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -318,7 +318,7 @@ belt = /obj/item/belt_harness/marine wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader/two suit_store = /obj/item/weapon/gun/rifle/tx11/freelancertwo - r_store = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/freelancer/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -339,7 +339,7 @@ /datum/outfit/job/freelancer/leader/three wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader/three suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer - r_store = /obj/item/storage/pouch/magazine/large + r_pocket = /obj/item/storage/pouch/magazine/large /datum/outfit/job/freelancer/leader/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() diff --git a/code/datums/jobs/job/icc.dm b/code/datums/jobs/job/icc.dm index 6d71c5fe1de3c..55f09cb84e5b3 100644 --- a/code/datums/jobs/job/icc.dm +++ b/code/datums/jobs/job/icc.dm @@ -41,8 +41,8 @@ id = /obj/item/card/id/silver gloves = /obj/item/clothing/gloves/marine/icc/insulated - r_store = /obj/item/storage/pouch/pistol/icc - l_store = /obj/item/storage/pouch/medical_injectors/icc/firstaid + r_pocket = /obj/item/storage/pouch/pistol/icc + l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid back = /obj/item/storage/backpack/lightpack/icc @@ -167,8 +167,8 @@ /datum/outfit/job/icc/guard/coilgun suit_store = /obj/item/weapon/gun/launcher/rocket/icc back = /obj/item/weapon/gun/rifle/icc_coilgun - l_store = /obj/item/storage/pouch/explosive/icc - r_store = /obj/item/storage/pouch/explosive/icc + l_pocket = /obj/item/storage/pouch/explosive/icc + r_pocket = /obj/item/storage/pouch/explosive/icc /datum/outfit/job/icc/guard/coilgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -192,8 +192,8 @@ /datum/outfit/job/icc/guard/icc_autoshotgun suit_store = /obj/item/weapon/gun/rifle/icc_coilgun back = /obj/item/weapon/gun/rifle/icc_autoshotgun/guard - l_store = /obj/item/storage/pouch/magazine/large/icc - r_store = /obj/item/storage/pouch/magazine/large/icc + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc /datum/outfit/job/icc/guard/icc_autoshotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -218,8 +218,8 @@ suit_store = /obj/item/weapon/gun/rifle/icc_coilgun back = /obj/item/storage/holster/icc_mg/full belt = /obj/item/ammo_magazine/icc_mg/belt - l_store = /obj/item/storage/pouch/magazine/large/icc - r_store = /obj/item/storage/pouch/magazine/large/icc + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc /datum/outfit/job/icc/guard/icc_bagmg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -277,8 +277,8 @@ /datum/outfit/job/icc/medic/icc_machinepistol suit_store = /obj/item/weapon/gun/smg/icc_machinepistol/medic - l_store = /obj/item/storage/pouch/magazine/large/icc - r_store = /obj/item/storage/pouch/magazine/large/icc + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc /datum/outfit/job/icc/medic/icc_machinepistol/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -296,8 +296,8 @@ /datum/outfit/job/icc/medic/icc_sharpshooter suit_store = /obj/item/weapon/gun/rifle/icc_sharpshooter/medic - l_store = /obj/item/storage/pouch/magazine/large/icc - r_store = /obj/item/storage/pouch/magazine/large/icc + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc /datum/outfit/job/icc/medic/icc_sharpshooter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -330,8 +330,8 @@ gloves = /obj/item/clothing/gloves/marine/icc/guard head = /obj/item/clothing/head/helmet/marine/icc/guard back = /obj/item/storage/backpack/lightpack/icc/guard - l_store = /obj/item/storage/pouch/medical_injectors/icc/firstaid - r_store = /obj/item/storage/pouch/construction/icc/full + l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid + r_pocket = /obj/item/storage/pouch/construction/icc/full /datum/outfit/job/icc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/datums/jobs/job/imperium.dm b/code/datums/jobs/job/imperium.dm index 81f6e7dc5b870..3db4d6786720b 100644 --- a/code/datums/jobs/job/imperium.dm +++ b/code/datums/jobs/job/imperium.dm @@ -22,8 +22,8 @@ //mask = //glasses = //suit_store = - //r_store = - //l_store = + //r_pocket = + //l_pocket = //back = /datum/outfit/job/imperial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -44,8 +44,8 @@ wear_suit = /obj/item/clothing/suit/storage/marine/imperial suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle head = /obj/item/clothing/head/helmet/marine/imperial - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/holster/flarepouch/full back = /obj/item/storage/backpack/lightpack /datum/outfit/job/imperial/guardsman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -73,8 +73,8 @@ wear_suit = /obj/item/clothing/suit/storage/marine/imperial/sergeant head = /obj/item/clothing/head/helmet/marine/imperial/sergeant - r_store = /obj/item/storage/pouch/explosive/upp - l_store = /obj/item/storage/pouch/field_pouch/full + r_pocket = /obj/item/storage/pouch/explosive/upp + l_pocket = /obj/item/storage/pouch/field_pouch/full /datum/job/imperial/guardsman/medicae title = "Guardsman Medicae" @@ -90,8 +90,8 @@ belt = /obj/item/storage/belt/lifesaver/full wear_suit = /obj/item/clothing/suit/storage/marine/imperial/medicae glasses = /obj/item/clothing/glasses/hud/health - l_store = /obj/item/storage/pouch/medkit/medic - r_store = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/medkit/medic + r_pocket = /obj/item/storage/pouch/medical_injectors/medic /datum/outfit/job/imperial/guardsman/medicae/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -121,8 +121,8 @@ suit_store = /obj/item/weapon/sword/commissar_sword gloves = /obj/item/clothing/gloves/marine/commissar head = /obj/item/clothing/head/commissar - l_store = /obj/item/storage/pouch/medkit/firstaid - r_store = /obj/item/storage/pouch/magazine/pistol/large/mateba + l_pocket = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/pouch/magazine/pistol/large/mateba back = /obj/item/storage/backpack/lightpack /datum/outfit/job/imperial/commissar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/datums/jobs/job/other.dm b/code/datums/jobs/job/other.dm index 9dd2384eeffbf..050780946c686 100644 --- a/code/datums/jobs/job/other.dm +++ b/code/datums/jobs/job/other.dm @@ -12,8 +12,8 @@ id = /obj/item/card/id w_uniform = /obj/item/clothing/under/colonist shoes = /obj/item/clothing/shoes/marine - l_store = /obj/item/storage/pouch/survival/full - r_store = /obj/item/radio + l_pocket = /obj/item/storage/pouch/survival/full + r_pocket = /obj/item/radio //Passenger @@ -40,8 +40,8 @@ shoes = /obj/item/clothing/shoes/red gloves = /obj/item/clothing/gloves/black head = /obj/item/clothing/head/soft/red - r_store = /obj/item/radio - l_store = /obj/item/reagent_containers/food/drinks/cans/dr_gibb + r_pocket = /obj/item/radio + l_pocket = /obj/item/reagent_containers/food/drinks/cans/dr_gibb back = /obj/item/storage/backpack/satchel r_hand = /obj/item/pizzabox/random diff --git a/code/datums/jobs/job/pmc.dm b/code/datums/jobs/job/pmc.dm index 0821038f0079f..43f4ba7cdca94 100644 --- a/code/datums/jobs/job/pmc.dm +++ b/code/datums/jobs/job/pmc.dm @@ -28,8 +28,8 @@ head = /obj/item/clothing/head/helmet/marine/veteran/pmc mask = /obj/item/clothing/mask/gas/pmc/leader suit_store = /obj/item/weapon/gun/smg/m25/elite/pmc - r_store = /obj/item/storage/pouch/grenade - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/satchel @@ -92,8 +92,8 @@ mask = /obj/item/clothing/mask/gas/pmc glasses = /obj/item/clothing/glasses/night/m56_goggles suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc - r_store = /obj/item/storage/pouch/explosive - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/explosive + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack @@ -151,8 +151,8 @@ mask = /obj/item/clothing/mask/gas/pmc glasses = /obj/item/clothing/glasses/night/m42_night_goggles suit_store = /obj/item/weapon/gun/rifle/sniper/elite - r_store = /obj/item/storage/pouch/magazine/large/pmc_sniper - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/magazine/large/pmc_sniper + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/satchel @@ -202,8 +202,8 @@ mask = /obj/item/clothing/mask/gas/pmc/leader glasses = /obj/item/clothing/glasses/night/m42_night_goggles suit_store = /obj/item/weapon/gun/rifle/m412/elite - r_store = /obj/item/storage/pouch/grenade - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/satchel diff --git a/code/datums/jobs/job/retired.dm b/code/datums/jobs/job/retired.dm index ab529bbd66b6b..eccc08c278aaa 100644 --- a/code/datums/jobs/job/retired.dm +++ b/code/datums/jobs/job/retired.dm @@ -21,8 +21,8 @@ back = /obj/item/storage/backpack/satchel belt = /obj/item/storage/belt/marine gloves = /obj/item/clothing/gloves/marine/black - l_store = /obj/item/storage/pouch/medkit/firstaid - r_store = /obj/item/storage/holster/flarepouch/full + l_pocket = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/holster/flarepouch/full suit_store = /obj/item/weapon/gun/rifle/m41a/magharness ears = /obj/item/radio/headset/distress/retired shoes = /obj/item/clothing/shoes/marine/brown/full diff --git a/code/datums/jobs/job/sectoid.dm b/code/datums/jobs/job/sectoid.dm index 56aa01e20edb9..d94bdf53acf1a 100644 --- a/code/datums/jobs/job/sectoid.dm +++ b/code/datums/jobs/job/sectoid.dm @@ -19,8 +19,8 @@ shoes = /obj/item/clothing/shoes/sectoid wear_suit = /obj/item/clothing/suit/armor/sectoid gloves = /obj/item/clothing/gloves/sectoid - r_store = /obj/item/stack/medical/heal_pack/gauze/sectoid - l_store = /obj/item/explosive/grenade/sectoid + r_pocket = /obj/item/stack/medical/heal_pack/gauze/sectoid + l_pocket = /obj/item/explosive/grenade/sectoid back = /obj/item/weapon/gun/rifle/sectoid_rifle var/list/abilities = list( diff --git a/code/datums/jobs/job/shipside.dm b/code/datums/jobs/job/shipside.dm index 2451a5f640565..48b1246a3f925 100644 --- a/code/datums/jobs/job/shipside.dm +++ b/code/datums/jobs/job/shipside.dm @@ -87,8 +87,8 @@ Godspeed, captain! And remember, you are not above the law."}) shoes = /obj/item/clothing/shoes/marinechief/captain gloves = /obj/item/clothing/gloves/marine/techofficer/captain head = /obj/item/clothing/head/beret/marine/captain - r_store = /obj/item/storage/pouch/general/large/command - l_store = /obj/item/hud_tablet/leadership + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/leadership back = /obj/item/storage/backpack/marine/satchel/captain_cloak /datum/outfit/job/command/captain/robot @@ -98,8 +98,8 @@ Godspeed, captain! And remember, you are not above the law."}) shoes = null gloves = null head = /obj/item/clothing/head/modular/robot - r_store = /obj/item/storage/pouch/general/large/command - l_store = /obj/item/hud_tablet/leadership + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/leadership /datum/outfit/job/command/captain_campaign name = CAPTAIN @@ -183,8 +183,8 @@ Make the TGMC proud!"}) shoes = /obj/item/clothing/shoes/marine/full gloves = /obj/item/clothing/gloves/marine/officer head = /obj/item/clothing/head/tgmcberet/fc - r_store = /obj/item/storage/pouch/general/large/command - l_store = /obj/item/hud_tablet/fieldcommand + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/fieldcommand suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander /datum/outfit/job/command/fieldcommander/robot @@ -195,8 +195,8 @@ Make the TGMC proud!"}) shoes = null gloves = null head = /obj/item/clothing/head/modular/robot - r_store = /obj/item/storage/pouch/general/large/command - l_store = /obj/item/hud_tablet/fieldcommand + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/fieldcommand suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander //Campaign version with specific loadout @@ -284,8 +284,8 @@ You are in charge of logistics and the overwatch system. You are also in line to w_uniform = /obj/item/clothing/under/marine/officer/bridge shoes = /obj/item/clothing/shoes/marine/full head = /obj/item/clothing/head/tgmccap/ro - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/binoculars/tactical + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/binoculars/tactical /datum/outfit/job/command/staffofficer/robot @@ -295,8 +295,8 @@ You are in charge of logistics and the overwatch system. You are also in line to shoes = null gloves = null head = /obj/item/clothing/head/modular/robot - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/binoculars/tactical + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/binoculars/tactical /datum/outfit/job/command/staffofficer_campaign name = STAFF_OFFICER @@ -370,8 +370,8 @@ You are to ensure the Tadpole's survival and to transport marines around, acting gloves = /obj/item/clothing/gloves/marine/insulated glasses = /obj/item/clothing/glasses/welding/superior head = /obj/item/clothing/head/helmet/marine/pilot - r_store = /obj/item/storage/pouch/construction - l_store = /obj/item/hud_tablet/transportofficer + r_pocket = /obj/item/storage/pouch/construction + l_pocket = /obj/item/hud_tablet/transportofficer back = /obj/item/storage/backpack/marine/engineerpack suit_store = /obj/item/storage/holster/belt/pistol/m4a3/vp70 @@ -452,8 +452,8 @@ Though you are an officer, your authority is limited to the dropship and the Con gloves = /obj/item/clothing/gloves/marine/insulated glasses = /obj/item/clothing/glasses/sunglasses/aviator head = /obj/item/clothing/head/helmet/marine/pilot - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/hud_tablet/pilot + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/hud_tablet/pilot //Mech pilot /datum/job/terragov/command/mech_pilot @@ -600,7 +600,7 @@ You can serve your Division in a variety of roles, so choose carefully."}) head = /obj/item/clothing/head/helmet/marine/assault_crewman shoes = /obj/item/clothing/shoes/marine/full gloves = /obj/item/clothing/gloves/marine - l_store = /obj/item/pamphlet/tank_loader + l_pocket = /obj/item/pamphlet/tank_loader //apc/jeep driver /datum/job/terragov/command/transport_crewman @@ -745,7 +745,7 @@ You are also next in the chain of command, should the bridge crew fall in the li glasses = /obj/item/clothing/glasses/welding/superior gloves = /obj/item/clothing/gloves/insulated head = /obj/item/clothing/head/beret/marine/techofficer - r_store = /obj/item/storage/pouch/construction + r_pocket = /obj/item/storage/pouch/construction back = /obj/item/storage/backpack/marine/engineerpack /datum/outfit/job/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -822,7 +822,7 @@ requisitions line and later on to be ready to send supplies for marines who are gloves = /obj/item/clothing/gloves/insulated glasses = /obj/item/clothing/glasses/welding/flipped head = /obj/item/clothing/head/tgmccap/req - r_store = /obj/item/storage/pouch/general/medium + r_pocket = /obj/item/storage/pouch/general/medium back = /obj/item/storage/backpack/marine/engineerpack /datum/job/terragov/requisitions @@ -904,7 +904,7 @@ A happy ship is a well-functioning ship."}) shoes = /obj/item/clothing/shoes/marine/full gloves = /obj/item/clothing/gloves/insulated head = /obj/item/clothing/head/tgmccap/req - r_store = /obj/item/storage/pouch/general/large + r_pocket = /obj/item/storage/pouch/general/large /datum/outfit/job/requisitions/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -993,8 +993,8 @@ Make sure that the doctors and nurses are doing their jobs and keeping the marin glasses = /obj/item/clothing/glasses/hud/health mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/cmo - r_store = /obj/item/storage/pouch/surgery - l_store = /obj/item/storage/pouch/medkit/doctor + r_pocket = /obj/item/storage/pouch/surgery + l_pocket = /obj/item/storage/pouch/medkit/doctor /datum/outfit/job/medical/professor/robot @@ -1083,8 +1083,8 @@ You are also an expert when it comes to medication and treatment. If you do not glasses = /obj/item/clothing/glasses/hud/health mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/surgery/purple - r_store = /obj/item/storage/pouch/surgery - l_store = /obj/item/storage/pouch/medkit/doctor + r_pocket = /obj/item/storage/pouch/surgery + l_pocket = /obj/item/storage/pouch/medkit/doctor /datum/outfit/job/medical/medicalofficer/robot @@ -1177,8 +1177,8 @@ It is also recommended that you gear up like a regular marine, or your 'internsh gloves = /obj/item/clothing/gloves/latex glasses = /obj/item/clothing/glasses/hud/health mask = /obj/item/clothing/mask/surgical - r_store = /obj/item/storage/pouch/surgery - l_store = /obj/item/storage/pouch/medkit/doctor + r_pocket = /obj/item/storage/pouch/surgery + l_pocket = /obj/item/storage/pouch/medkit/doctor /datum/outfit/job/medical/researcher/robot @@ -1349,8 +1349,8 @@ In addition, being a Synthetic gives you knowledge in every field and specializa w_uniform = /obj/item/clothing/under/rank/synthetic shoes = /obj/item/clothing/shoes/white gloves = /obj/item/clothing/gloves/insulated - r_store = /obj/item/storage/pouch/general/medium - l_store = /obj/item/storage/pouch/general/medium + r_pocket = /obj/item/storage/pouch/general/medium + l_pocket = /obj/item/storage/pouch/general/medium /datum/job/terragov/silicon/ai diff --git a/code/datums/jobs/job/skeleton.dm b/code/datums/jobs/job/skeleton.dm index dce97a5502e08..7b23352c931fc 100644 --- a/code/datums/jobs/job/skeleton.dm +++ b/code/datums/jobs/job/skeleton.dm @@ -29,8 +29,8 @@ belt = /obj/item/weapon/sword back = /obj/item/weapon/twohanded/spear ears = /obj/item/radio/headset/survivor - r_store = /obj/item/flashlight - l_store = /obj/item/tool/crowbar/red + r_pocket = /obj/item/flashlight + l_pocket = /obj/item/tool/crowbar/red /datum/outfit/job/skeleton/basic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -53,8 +53,8 @@ belt = /obj/item/weapon/sword back = /obj/item/weapon/twohanded/glaive ears = /obj/item/radio/headset/survivor - r_store = /obj/item/flashlight - l_store = /obj/item/reagent_containers/food/drinks/milk + r_pocket = /obj/item/flashlight + l_pocket = /obj/item/reagent_containers/food/drinks/milk /datum/outfit/job/skeleton/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() diff --git a/code/datums/jobs/job/sons_of_mars_ert.dm b/code/datums/jobs/job/sons_of_mars_ert.dm index effeb8a7eb170..0fc546327a48c 100644 --- a/code/datums/jobs/job/sons_of_mars_ert.dm +++ b/code/datums/jobs/job/sons_of_mars_ert.dm @@ -32,8 +32,8 @@ gloves = /obj/item/clothing/gloves/marine/som mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som - r_store = /obj/item/storage/pouch/firstaid/som/full - l_store = /obj/item/storage/pouch/grenade/som/ert + r_pocket = /obj/item/storage/pouch/firstaid/som/full + l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som /datum/outfit/job/som/ert/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -180,8 +180,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/magazine/large/som - l_store = /obj/item/storage/pouch/grenade/som/ert + r_pocket = /obj/item/storage/pouch/magazine/large/som + l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som /datum/outfit/job/som/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -243,7 +243,7 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) /datum/outfit/job/som/ert/medic/standard_shotgun - r_store = /obj/item/storage/pouch/shotgun/som + r_pocket = /obj/item/storage/pouch/shotgun/som suit_store = /obj/item/weapon/gun/shotgun/som/support /datum/outfit/job/som/ert/medic/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -297,8 +297,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som/veteran glasses = /obj/item/clothing/glasses/meson - r_store = /obj/item/storage/pouch/firstaid/som/full - l_store = /obj/item/storage/pouch/grenade/som/ert + r_pocket = /obj/item/storage/pouch/firstaid/som/full + l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som /datum/outfit/job/som/ert/veteran/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -387,7 +387,7 @@ /datum/outfit/job/som/ert/veteran/caliver_pack belt = /obj/item/storage/belt/grenade/som suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet - l_store = /obj/item/storage/pouch/pistol/som + l_pocket = /obj/item/storage/pouch/pistol/som back = /obj/item/cell/lasgun/volkite/powerpack /datum/outfit/job/som/ert/veteran/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -431,7 +431,7 @@ suit_store = /obj/item/weapon/gun/smg/som/support belt = /obj/item/storage/belt/marine/som back = /obj/item/storage/holster/backholster/rpg/som/ert - l_store = /obj/item/storage/pouch/grenade/som + l_pocket = /obj/item/storage/pouch/grenade/som /datum/outfit/job/som/ert/veteran/rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -548,8 +548,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som/leader glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader - l_store = /obj/item/storage/pouch/grenade/som/ert + r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som /datum/outfit/job/som/ert/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -716,7 +716,7 @@ suit_store = /obj/item/weapon/twohanded/fireaxe/som belt = /obj/item/storage/belt/grenade/som back = /obj/item/storage/holster/backholster/rpg/som/ert - l_store = /obj/item/storage/pouch/explosive/som + l_pocket = /obj/item/storage/pouch/explosive/som /datum/outfit/job/som/ert/veteran/breacher_rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() diff --git a/code/datums/jobs/job/sons_of_mars_shipside.dm b/code/datums/jobs/job/sons_of_mars_shipside.dm index 6d920b2f9fd09..95121edfbd31b 100644 --- a/code/datums/jobs/job/sons_of_mars_shipside.dm +++ b/code/datums/jobs/job/sons_of_mars_shipside.dm @@ -248,8 +248,8 @@ Though you are a warrant officer, your authority is limited to the dropship and gloves = /obj/item/clothing/gloves/insulated glasses = /obj/item/clothing/glasses/sunglasses/aviator head = /obj/item/clothing/head/helmet/marine/pilot - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/hud_tablet/pilot + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/hud_tablet/pilot //Mech pilot /datum/job/som/command/mech_pilot @@ -386,7 +386,7 @@ You are also next in the chain of command, should the bridge crew fall in the li glasses = /obj/item/clothing/glasses/welding/superior gloves = /obj/item/clothing/gloves/insulated head = /obj/item/clothing/head/beret/marine/techofficer - r_store = /obj/item/storage/pouch/construction + r_pocket = /obj/item/storage/pouch/construction back = /obj/item/storage/backpack/marine/engineerpack /datum/outfit/job/som/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -457,7 +457,7 @@ requisitions line and later on to be ready to send supplies for marines who are gloves = /obj/item/clothing/gloves/insulated glasses = /obj/item/clothing/glasses/welding/flipped head = /obj/item/clothing/head/tgmccap/req - r_store = /obj/item/storage/pouch/general/medium + r_pocket = /obj/item/storage/pouch/general/medium back = /obj/item/storage/backpack/marine/engineerpack /datum/job/som/requisitions @@ -532,7 +532,7 @@ A happy base is a well-functioning base."}) shoes = /obj/item/clothing/shoes/marine/full gloves = /obj/item/clothing/gloves/insulated head = /obj/item/clothing/head/tgmccap/req - r_store = /obj/item/storage/pouch/general/large + r_pocket = /obj/item/storage/pouch/general/large /datum/job/som/medical job_category = JOB_CAT_MEDICAL @@ -599,8 +599,8 @@ Make sure that the doctors and nurses are doing their jobs and keeping the SOM h glasses = /obj/item/clothing/glasses/hud/health mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/cmo - r_store = /obj/item/storage/pouch/medkit/doctor - l_store = /obj/item/storage/pouch/surgery + r_pocket = /obj/item/storage/pouch/medkit/doctor + l_pocket = /obj/item/storage/pouch/surgery /datum/outfit/job/som/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() diff --git a/code/datums/jobs/job/special_forces.dm b/code/datums/jobs/job/special_forces.dm index 11a31edec3ef9..1c9c5a268cc3a 100644 --- a/code/datums/jobs/job/special_forces.dm +++ b/code/datums/jobs/job/special_forces.dm @@ -26,8 +26,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/modular/m10x suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed - r_store = /obj/item/storage/pouch/grenade - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack /datum/outfit/job/special_forces/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -85,8 +85,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/modular/m10x suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed/breacher - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/medkit/firstaid back = /obj/item/storage/backpack/lightpack /datum/outfit/job/special_forces/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -140,8 +140,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/modular/m10x/welding suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed - r_store = /obj/item/storage/pouch/grenade - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack /datum/outfit/job/special_forces/drone_operator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -199,8 +199,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed - r_store = /obj/item/storage/pouch/medical_injectors/medic - l_store = /obj/item/storage/pouch/magazine/large + r_pocket = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/magazine/large back = /obj/item/storage/backpack/lightpack @@ -246,8 +246,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/beret/sec suit_store = /obj/item/weapon/gun/rifle/m16/spec_op - r_store = /obj/item/storage/pouch/shotgun - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/shotgun + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm index d2c3c8da9a47c..ed472b51b4c79 100644 --- a/code/datums/jobs/job/survivor.dm +++ b/code/datums/jobs/job/survivor.dm @@ -78,7 +78,7 @@ Good luck, but do not expect to survive."}) mask = /obj/item/clothing/mask/gas/tactical/coif head = /obj/item/clothing/head/welding/flipped belt = /obj/item/storage/belt/utility/full - l_store = /obj/item/flashlight/combat + l_pocket = /obj/item/flashlight/combat r_hand = /obj/item/weapon/combat_knife @@ -99,8 +99,8 @@ Good luck, but do not expect to survive."}) back = /obj/item/storage/backpack/toxins ears = /obj/item/radio/survivor l_hand = /obj/item/storage/firstaid/adv - l_store = /obj/item/storage/pouch/surgery - r_store = /obj/item/flashlight/combat + l_pocket = /obj/item/storage/pouch/surgery + r_pocket = /obj/item/flashlight/combat /datum/outfit/job/survivor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -129,7 +129,7 @@ Good luck, but do not expect to survive."}) back = /obj/item/storage/backpack/satchel/med gloves = /obj/item/clothing/gloves/latex glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/surgery + r_pocket = /obj/item/storage/pouch/surgery belt = /obj/item/storage/belt/rig mask = /obj/item/clothing/mask/surgical ears = /obj/item/radio/survivor @@ -175,7 +175,7 @@ Good luck, but do not expect to survive."}) ears = /obj/item/radio/survivor belt = /obj/item/storage/holster/belt/pistol/m4a3/vp78 l_hand = /obj/item/flashlight/combat - l_store = /obj/item/tool/crowbar + l_pocket = /obj/item/tool/crowbar //Security Guard /datum/job/survivor/security @@ -281,8 +281,8 @@ Good luck, but do not expect to survive."}) back = /obj/item/storage/backpack/hydroponics ears = /obj/item/radio/survivor suit_store = /obj/item/weapon/combat_knife - l_store = /obj/item/flashlight - r_store = /obj/item/tool/crowbar + l_pocket = /obj/item/flashlight + r_pocket = /obj/item/tool/crowbar /datum/outfit/job/survivor/botanist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -311,8 +311,8 @@ Good luck, but do not expect to survive."}) belt = /obj/item/storage/belt head = /obj/item/clothing/head/hardhat/white glasses = /obj/item/clothing/glasses/welding - r_store = /obj/item/storage/pouch/electronics/full - l_store = /obj/item/storage/pouch/construction + r_pocket = /obj/item/storage/pouch/electronics/full + l_pocket = /obj/item/storage/pouch/construction ears = /obj/item/radio/survivor /datum/outfit/job/survivor/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -374,7 +374,7 @@ Good luck, but do not expect to survive."}) shoes = /obj/item/clothing/shoes/black back = /obj/item/storage/backpack/satchel/som l_hand = /obj/item/weapon/twohanded/sledgehammer - r_store = /obj/item/reagent_containers/cup/glass/flask + r_pocket = /obj/item/reagent_containers/cup/glass/flask r_hand = /obj/item/clothing/suit/space/rig/mining ears = /obj/item/radio/survivor @@ -432,7 +432,7 @@ Good luck, but do not expect to survive."}) suit_store = /obj/item/storage/holster/belt/m44/full belt = /obj/item/storage/belt/sparepouch gloves = /obj/item/clothing/gloves/ruggedgloves - l_store = /obj/item/flashlight/combat + l_pocket = /obj/item/flashlight/combat ears = /obj/item/radio/survivor head = /obj/item/clothing/head/slouch @@ -460,8 +460,8 @@ Good luck, but do not expect to survive."}) gloves = /obj/item/clothing/gloves/ruggedgloves suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer belt = /obj/item/storage/belt/marine/alf_machinecarbine - l_store = /obj/item/storage/pouch/medical_injectors/firstaid - r_store = /obj/item/flashlight/combat + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/flashlight/combat glasses = /obj/item/clothing/glasses/m42_goggles head = /obj/item/clothing/head/headband ears = /obj/item/radio/survivor diff --git a/code/datums/jobs/job/upp.dm b/code/datums/jobs/job/upp.dm index 2b8ea1dacf877..ac068a7c95572 100644 --- a/code/datums/jobs/job/upp.dm +++ b/code/datums/jobs/job/upp.dm @@ -29,8 +29,8 @@ head = /obj/item/clothing/head/helmet/UPP mask = /obj/item/clothing/mask/gas/pmc/leader suit_store = /obj/item/weapon/gun/rifle/type71 - r_store = /obj/item/storage/pouch/pistol - l_store = /obj/item/storage/pouch/magazine/pistol/large + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/magazine/pistol/large back = /obj/item/storage/backpack/lightpack /datum/outfit/job/upp/standard/hvh @@ -95,8 +95,8 @@ head = /obj/item/clothing/head/uppcap glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/weapon/gun/smg/skorpion - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/general/large + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/general/large back = /obj/item/storage/backpack/lightpack /datum/outfit/job/upp/medic/hvh @@ -157,8 +157,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/UPP/heavy suit_store = /obj/item/weapon/gun/rifle/type71/flamer - r_store = /obj/item/storage/pouch/explosive - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/explosive + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack /datum/outfit/job/upp/heavy/hvh @@ -216,8 +216,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/uppcap/beret suit_store = /obj/item/weapon/gun/rifle/type71 - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack /datum/outfit/job/upp/leader/hvh diff --git a/code/datums/jobs/job/upp_commando.dm b/code/datums/jobs/job/upp_commando.dm index 4793d64d11fb5..5ade4e827028e 100644 --- a/code/datums/jobs/job/upp_commando.dm +++ b/code/datums/jobs/job/upp_commando.dm @@ -28,8 +28,8 @@ mask = /obj/item/clothing/mask/gas/pmc/upp glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp suit_store = /obj/item/weapon/gun/rifle/type71/commando - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack implants = list(/obj/item/implant/suicide_dust) @@ -82,8 +82,8 @@ mask = /obj/item/clothing/mask/gas/pmc/upp glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp suit_store = /obj/item/weapon/gun/smg/skorpion - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/general/large + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/general/large back = /obj/item/storage/backpack/lightpack implants = list(/obj/item/implant/suicide_dust) @@ -141,8 +141,8 @@ mask = /obj/item/clothing/mask/gas/pmc/upp glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp suit_store = /obj/item/weapon/gun/rifle/type71/commando - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack implants = list(/obj/item/implant/suicide_dust) diff --git a/code/datums/jobs/job/vsd.dm b/code/datums/jobs/job/vsd.dm index 01e882e496697..3d54417742448 100644 --- a/code/datums/jobs/job/vsd.dm +++ b/code/datums/jobs/job/vsd.dm @@ -31,8 +31,8 @@ wear_suit = /obj/item/clothing/suit/storage/marine/vsd gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/vsd - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/magazine + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd belt = /obj/item/storage/holster/belt/pistol/standard_pistol @@ -89,7 +89,7 @@ w_uniform = /obj/item/clothing/under/vsd/shirt/webbing wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/standard - l_store = /obj/item/storage/pouch/shotgun + l_pocket = /obj/item/storage/pouch/shotgun /datum/outfit/job/vsd/standard/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -163,8 +163,8 @@ wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/desert gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/vsd/secondary - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/magazine + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd belt = /obj/item/storage/belt/utility/full @@ -252,8 +252,8 @@ wear_suit = /obj/item/clothing/suit/storage/marine/vsd gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/vsd/medic - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/magazine + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd /datum/outfit/job/vsd/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -278,7 +278,7 @@ /datum/outfit/job/vsd/medic/ksg suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/support - l_store = /obj/item/storage/pouch/shotgun + l_pocket = /obj/item/storage/pouch/shotgun /datum/outfit/job/vsd/medic/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -365,7 +365,7 @@ w_uniform = /obj/item/clothing/under/vsd/webbing shoes = /obj/item/clothing/shoes/marine/vsd gloves = /obj/item/clothing/gloves/marine/veteran/pmc - r_store = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack/vsd belt = /obj/item/storage/holster/belt/pistol/standard_pistol @@ -390,7 +390,7 @@ suit_store = /obj/item/weapon/gun/flamer/big_flamer/vsd back = /obj/item/ammo_magazine/flamer_tank/backtank/X w_uniform = /obj/item/clothing/under/vsd/shirt/webbing - l_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/vsd/spec/flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -414,7 +414,7 @@ belt = /obj/item/belt_harness/marine glasses = /obj/item/clothing/glasses/meson suit_store = /obj/item/weapon/gun/launcher/rocket/vsd - l_store = /obj/item/storage/pouch/explosive + l_pocket = /obj/item/storage/pouch/explosive /datum/outfit/job/vsd/spec/demolitionist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -481,7 +481,7 @@ head = /obj/item/clothing/head/helmet/marine/vsd/upp mask = /obj/item/clothing/mask/gas/vsd suit_store = /obj/item/weapon/gun/rifle/type71/flamer - l_store = /obj/item/storage/pouch/magazine + l_pocket = /obj/item/storage/pouch/magazine /datum/outfit/job/vsd/spec/uslspec_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -522,7 +522,7 @@ mask = /obj/item/clothing/mask/gas/vsd suit_store = /obj/item/weapon/gun/clf_heavyrifle back = /obj/item/shotgunbox/clf_heavyrifle - l_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/grenade /datum/outfit/job/vsd/spec/uslspec_two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -572,8 +572,8 @@ gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/vsd/juggernaut mask = /obj/item/clothing/mask/gas/vsd - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/magazine + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd /datum/outfit/job/vsd/juggernaut/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -621,8 +621,8 @@ head = /obj/item/clothing/head/helmet/marine/vsd/eod belt = /obj/item/belt_harness/marine mask = /obj/item/clothing/mask/gas/vsd - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/explosive + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/explosive back = /obj/item/storage/backpack/lightpack/vsd /datum/outfit/job/vsd/eod/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -682,8 +682,8 @@ w_uniform = /obj/item/clothing/under/vsd/webbing shoes = /obj/item/clothing/shoes/marine/vsd gloves = /obj/item/clothing/gloves/marine/veteran/pmc - r_store = /obj/item/storage/pouch/medical_injectors/firstaid - l_store = /obj/item/storage/pouch/magazine + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd /datum/outfit/job/vsd/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 07140ed123bda..9a73a09d758d9 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -1,31 +1,47 @@ /datum/outfit + /// The name of this outfit that will show in select outfit var/name = "" + /// The worn uniform of this outfit + var/w_uniform + /// The worn suit of this outfit + var/wear_suit + /// The item in the slot of this outfit, set to FALSE if you want to have nothing (defaults to player pref if null) + var/back + /// The item in the belt slot + var/belt + /// The item in the glove slot + var/gloves + /// The item in the shoe slot + var/shoes + /// The item in the head slot + var/head + /// The item in the mask slot + var/mask + /// The item in the ear slot + var/ears + /// The item in the glasses/eye slot + var/glasses + /// The item in the ID slot + var/id + /// The item in the left pocket + var/l_pocket + /// The item in the right pocket + var/r_pocket + /// The item in the suit storage slot + var/suit_store + /// The item in the right hand + var/r_hand + /// The item in the left_hand + var/l_hand + /** + * List of items that should go in the backpack of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/backpack_contents + /// The implants this outfit comes with + var/list/implants - var/w_uniform = null - var/wear_suit = null - var/toggle_helmet = TRUE - var/back = null // Set to FALSE if your outfit needs nothing in back slot at all - var/belt = null - var/gloves = null - var/shoes = null - var/head = null - var/mask = null - var/neck = null - var/ears = null - var/glasses = null - var/id = null - var/l_store = null - var/r_store = null - var/suit_store = null - var/r_hand = null - var/l_hand = null - var/internals_slot = null //ID of slot containing a gas tank - var/list/backpack_contents = null // In the list(path=count,otherpath=count) format - var/box // Internals box. Will be inserted at the start of backpack_contents - var/list/implants = null - var/accessory = null - - var/can_be_admin_equipped = TRUE // Set to FALSE if your outfit requires runtime parameters ///the species this outfit is designed for var/species = SPECIES_HUMAN @@ -77,16 +93,10 @@ H.put_in_r_hand(new r_hand(H)) if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. - if(l_store) - H.equip_to_slot_or_del(new l_store(H), SLOT_L_STORE, override_nodrop = TRUE) - if(r_store) - H.equip_to_slot_or_del(new r_store(H), SLOT_R_STORE, override_nodrop = TRUE) - - if(box) - if(!backpack_contents) - backpack_contents = list() - backpack_contents.Insert(1, box) - backpack_contents[box] = 1 + if(l_pocket) + H.equip_to_slot_or_del(new l_pocket(H), SLOT_L_STORE, override_nodrop = TRUE) + if(r_pocket) + H.equip_to_slot_or_del(new r_pocket(H), SLOT_R_STORE, override_nodrop = TRUE) if(backpack_contents) for(var/path in backpack_contents) @@ -98,10 +108,6 @@ post_equip(H, visualsOnly) - if(!visualsOnly) - if(internals_slot) - H.internal = H.get_item_by_slot(internals_slot) - if(implants && implants.len) for(var/implant_type in implants) var/obj/item/implant/implanter = new implant_type(H) @@ -117,7 +123,6 @@ .["name"] = name .["uniform"] = w_uniform .["suit"] = wear_suit - .["toggle_helmet"] = toggle_helmet .["back"] = back .["belt"] = belt .["gloves"] = gloves @@ -127,23 +132,19 @@ .["ears"] = ears .["glasses"] = glasses .["id"] = id - .["l_store"] = l_store - .["r_store"] = r_store + .["l_pocket"] = l_pocket + .["r_pocket"] = r_pocket .["suit_store"] = suit_store .["r_hand"] = r_hand .["l_hand"] = l_hand - .["internals_slot"] = internals_slot .["backpack_contents"] = backpack_contents - .["box"] = box .["implants"] = implants - .["accessory"] = accessory /// Copy most vars from another outfit to this one /datum/outfit/proc/copy_from(datum/outfit/target) name = target.name w_uniform = target.w_uniform wear_suit = target.wear_suit - toggle_helmet = target.toggle_helmet back = target.back belt = target.belt gloves = target.gloves @@ -153,16 +154,13 @@ ears = target.ears glasses = target.glasses id = target.id - l_store = target.l_store - r_store = target.r_store + l_pocket = target.l_pocket + r_pocket = target.r_pocket suit_store = target.suit_store r_hand = target.r_hand l_hand = target.l_hand - internals_slot = target.internals_slot backpack_contents = target.backpack_contents - box = target.box implants = target.implants - accessory = target.accessory return TRUE /datum/outfit/proc/save_to_file() @@ -179,7 +177,6 @@ name = outfit_data["name"] w_uniform = text2path(outfit_data["w_uniform"]) wear_suit = text2path(outfit_data["wear_suit"]) - toggle_helmet = outfit_data["toggle_helmet"] back = text2path(outfit_data["back"]) belt = text2path(outfit_data["belt"]) gloves = text2path(outfit_data["gloves"]) @@ -189,26 +186,23 @@ ears = text2path(outfit_data["ears"]) glasses = text2path(outfit_data["glasses"]) id = text2path(outfit_data["id"]) - l_store = text2path(outfit_data["l_store"]) - r_store = text2path(outfit_data["r_store"]) + l_pocket = text2path(outfit_data["l_pocket"]) + r_pocket = text2path(outfit_data["r_pocket"]) suit_store = text2path(outfit_data["suit_store"]) r_hand = text2path(outfit_data["r_hand"]) l_hand = text2path(outfit_data["l_hand"]) - internals_slot = outfit_data["internals_slot"] var/list/backpack = outfit_data["backpack_contents"] backpack_contents = list() for(var/item in backpack) var/itype = text2path(item) if(itype) backpack_contents[itype] = backpack[item] - box = text2path(outfit_data["box"]) var/list/impl = outfit_data["implants"] implants = list() for(var/I in impl) var/imptype = text2path(I) if(imptype) implants += imptype - accessory = text2path(outfit_data["accessory"]) return TRUE /datum/outfit/proc/from_mob(mob/living/base) @@ -238,8 +232,8 @@ ears = human_mob.wear_ear?.type glasses = human_mob.glasses?.type id = human_mob.wear_id?.type - l_store = human_mob.l_store?.type - r_store = human_mob.r_store?.type + l_pocket = human_mob.l_pocket?.type + r_pocket = human_mob.r_pocket?.type /datum/outfit/vv_get_dropdown() . = ..() diff --git a/code/datums/quick_load_beginners.dm b/code/datums/quick_load_beginners.dm index 74d4d62dc0c3b..c7619d4ef779a 100644 --- a/code/datums/quick_load_beginners.dm +++ b/code/datums/quick_load_beginners.dm @@ -15,8 +15,8 @@ gloves = /obj/item/clothing/gloves/marine/black mask = /obj/item/clothing/mask/bandanna head = /obj/item/clothing/head/modular/m10x - r_store = /obj/item/storage/pouch/medkit/firstaid - l_store = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/medkit/firstaid + l_pocket = /obj/item/storage/holster/flarepouch/full back = /obj/item/storage/backpack/marine/satchel belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/mainship/marine @@ -114,8 +114,8 @@ head = /obj/item/clothing/head/modular/style/boonie w_uniform = /obj/item/clothing/under/marine/holster belt = /obj/item/belt_harness/marine - l_store = /obj/item/storage/pouch/magazine/large - r_store = /obj/item/storage/pouch/magazine/large + l_pocket = /obj/item/storage/pouch/magazine/large + r_pocket = /obj/item/storage/pouch/magazine/large suit_store = /obj/item/weapon/gun/rifle/standard_dmr/beginner mask = /obj/item/clothing/mask/breath l_hand = /obj/item/paper/tutorial/beginner_marksman @@ -205,7 +205,7 @@ wear_suit = /obj/item/clothing/suit/modular/xenonauten/lightgeneral head = /obj/item/clothing/head/modular/style/cap mask = /obj/item/clothing/mask/gas/modular/skimask - r_store = /obj/item/cell/lasgun/volkite/powerpack/marine + r_pocket = /obj/item/cell/lasgun/volkite/powerpack/marine w_uniform = /obj/item/clothing/under/marine/corpman_vest shoes = /obj/item/clothing/shoes/marine l_hand = /obj/item/paper/tutorial/beginner_shocktrooper @@ -319,8 +319,8 @@ wear_suit = /obj/item/clothing/suit/modular/xenonauten/heavy/grenadier suit_store = /obj/item/weapon/gun/grenade_launcher/multinade_launcher/beginner - l_store = /obj/item/storage/pouch/grenade - r_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/grenade + r_pocket = /obj/item/storage/pouch/grenade belt = /obj/item/storage/belt/grenade mask = /obj/item/clothing/mask/gas w_uniform = /obj/item/clothing/under/marine/corpman_vest @@ -384,7 +384,7 @@ w_uniform = /obj/item/clothing/under/marine/brown_vest shoes = /obj/item/clothing/shoes/marine gloves = /obj/item/clothing/gloves/marine/insulated - l_store = /obj/item/storage/pouch/tools + l_pocket = /obj/item/storage/pouch/tools /datum/outfit/quick/beginner/engineer/post_equip(mob/living/carbon/human/human, visualsOnly) . = ..() @@ -518,8 +518,8 @@ gloves = /obj/item/clothing/gloves/defibrillator mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/m10x/mimir - r_store = /obj/item/storage/pouch/medkit/medic - l_store = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/medkit/medic + l_pocket = /obj/item/storage/pouch/shotgun back = /obj/item/storage/backpack/marine/corpsman belt = /obj/item/storage/belt/lifesaver/beginner l_hand = /obj/item/paper/tutorial/lifesaver @@ -572,8 +572,8 @@ gloves = /obj/item/healthanalyzer/gloves mask = /obj/item/clothing/mask/gas/modular/coofmask head = /obj/item/clothing/head/modular/m10x/antenna - r_store = /obj/item/storage/pouch/medkit/medic - l_store = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/medkit/medic + l_pocket = /obj/item/storage/pouch/shotgun back = /obj/item/storage/backpack/marine/corpsman belt = /obj/item/storage/belt/hypospraybelt/beginner l_hand = /obj/item/paper/tutorial/hypobelt diff --git a/code/datums/quick_load_civil_war.dm b/code/datums/quick_load_civil_war.dm index 7b24af1b16dd2..08ccdabe3519e 100644 --- a/code/datums/quick_load_civil_war.dm +++ b/code/datums/quick_load_civil_war.dm @@ -13,8 +13,8 @@ head = /obj/item/clothing/head/redcoat belt = /obj/item/storage/belt/shotgun/martini/full back = /obj/item/weapon/gun/shotgun/double/martini - r_store = /obj/item/storage/pouch/firstaid - l_store = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/firstaid + l_pocket = /obj/item/storage/holster/flarepouch/full /datum/outfit/quick/civil_war/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() diff --git a/code/datums/quick_load_outfits.dm b/code/datums/quick_load_outfits.dm index 887b87ae69ff4..8a2ac0481eacd 100644 --- a/code/datums/quick_load_outfits.dm +++ b/code/datums/quick_load_outfits.dm @@ -59,18 +59,12 @@ H.put_in_r_hand(new r_hand(H)) if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. - if(l_store) - qdel(H.l_store) - H.equip_to_slot_or_del(new l_store(H),SLOT_L_STORE, override_nodrop = TRUE) - if(r_store) - qdel(H.r_store) - H.equip_to_slot_or_del(new r_store(H),SLOT_R_STORE, override_nodrop = TRUE) - - if(box) - if(!backpack_contents) - backpack_contents = list() - backpack_contents.Insert(1, box) - backpack_contents[box] = 1 + if(l_pocket) + qdel(H.l_pocket) + H.equip_to_slot_or_del(new l_pocket(H),SLOT_L_STORE, override_nodrop = TRUE) + if(r_pocket) + qdel(H.r_pocket) + H.equip_to_slot_or_del(new r_pocket(H),SLOT_R_STORE, override_nodrop = TRUE) if(backpack_contents) for(var/path in backpack_contents) @@ -82,10 +76,6 @@ post_equip(H, visualsOnly) - if(!visualsOnly) - if(internals_slot) - H.internal = H.get_item_by_slot(internals_slot) - H.update_body() return TRUE @@ -108,8 +98,8 @@ gloves = /obj/item/clothing/gloves/marine mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/m10x - r_store = /obj/item/storage/pouch/firstaid/combat_patrol - l_store = /obj/item/storage/pouch/grenade/combat_patrol + r_pocket = /obj/item/storage/pouch/firstaid/combat_patrol + l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/satchel /datum/outfit/quick/tgmc/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -285,7 +275,7 @@ belt = /obj/item/storage/belt/sparepouch suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner - l_store = /obj/item/storage/pouch/construction + l_pocket = /obj/item/storage/pouch/construction /datum/outfit/quick/tgmc/marine/standard_machinegunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -318,7 +308,7 @@ belt = /obj/item/storage/holster/m25 wear_suit = /obj/item/clothing/suit/modular/xenonauten/shield suit_store = /obj/item/weapon/gun/standard_mmg/machinegunner - l_store = /obj/item/storage/pouch/construction + l_pocket = /obj/item/storage/pouch/construction glasses = /obj/item/clothing/glasses/mgoggles /datum/outfit/quick/tgmc/marine/medium_machinegunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -540,8 +530,8 @@ gloves = /obj/item/clothing/gloves/marine/insulated mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/m10x/welding - r_store = /obj/item/storage/pouch/firstaid/combat_patrol - l_store = /obj/item/storage/pouch/tools/full + r_pocket = /obj/item/storage/pouch/firstaid/combat_patrol + l_pocket = /obj/item/storage/pouch/tools/full back = /obj/item/storage/backpack/marine/engineerpack /datum/outfit/quick/tgmc/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -639,8 +629,8 @@ gloves = /obj/item/clothing/gloves/marine mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/m10x/mimir - r_store = /obj/item/storage/pouch/magazine/large - l_store = /obj/item/storage/pouch/grenade/combat_patrol + r_pocket = /obj/item/storage/pouch/magazine/large + l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/corpsman /datum/outfit/quick/tgmc/corpsman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -823,8 +813,8 @@ gloves = /obj/item/clothing/gloves/marine mask = /obj/item/clothing/mask/gas/tactical head = /obj/item/clothing/head/modular/m10x/tyr - r_store = /obj/item/storage/pouch/firstaid/combat_patrol - l_store = /obj/item/storage/pouch/grenade/combat_patrol + r_pocket = /obj/item/storage/pouch/firstaid/combat_patrol + l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/satchel /datum/outfit/quick/tgmc/smartgunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -917,8 +907,8 @@ gloves = /obj/item/clothing/gloves/marine mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/m10x/leader - r_store = /obj/item/storage/pouch/firstaid/combat_patrol_leader - l_store = /obj/item/storage/pouch/grenade/combat_patrol + r_pocket = /obj/item/storage/pouch/firstaid/combat_patrol_leader + l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/lightpack /datum/outfit/quick/tgmc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1144,8 +1134,8 @@ gloves = /obj/item/clothing/gloves/marine/som mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som - r_store = /obj/item/storage/pouch/firstaid/som/combat_patrol - l_store = /obj/item/storage/pouch/grenade/som/combat_patrol + r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol + l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/satchel/som /datum/outfit/quick/som/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1370,7 +1360,7 @@ suit_store = /obj/item/weapon/gun/rifle/som_mg/standard belt = /obj/item/storage/holster/belt/pistol/m4a3/som - l_store = /obj/item/storage/pouch/construction/som + l_pocket = /obj/item/storage/pouch/construction/som /datum/outfit/quick/som/marine/machine_gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -1435,8 +1425,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som/engineer glasses = /obj/item/clothing/glasses/meson - r_store = /obj/item/storage/pouch/firstaid/som/combat_patrol - l_store = /obj/item/storage/pouch/tools/som/full + r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol + l_pocket = /obj/item/storage/pouch/tools/som/full back = /obj/item/storage/backpack/lightpack/som /datum/outfit/quick/som/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1615,8 +1605,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/magazine/large/som - l_store = /obj/item/storage/pouch/grenade/som/combat_patrol + r_pocket = /obj/item/storage/pouch/magazine/large/som + l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/lightpack/som /datum/outfit/quick/som/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1746,7 +1736,7 @@ name = "V-51 Medic" desc = "Keeping your buddies alive and in the fight. Equipped with a V-51 semi-automatic shotgun, medium armor and a good selection of grenades. Packs a large amount of medical supplies, the squad medic is vital to maintaining combat viability." - r_store = /obj/item/storage/pouch/shotgun/som + r_pocket = /obj/item/storage/pouch/shotgun/som suit_store = /obj/item/weapon/gun/shotgun/som/support /datum/outfit/quick/som/medic/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1785,8 +1775,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som/veteran glasses = /obj/item/clothing/glasses/meson - r_store = /obj/item/storage/pouch/firstaid/som/combat_patrol - l_store = /obj/item/storage/pouch/grenade/som/combat_patrol + r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol + l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/satchel/som /datum/outfit/quick/som/veteran/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1928,7 +1918,7 @@ belt = /obj/item/storage/belt/grenade/som suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor - l_store = /obj/item/storage/pouch/pistol/som + l_pocket = /obj/item/storage/pouch/pistol/som back = /obj/item/cell/lasgun/volkite/powerpack /datum/outfit/quick/som/veteran/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -2024,7 +2014,7 @@ suit_store = /obj/item/weapon/gun/smg/som/support belt = /obj/item/storage/belt/marine/som back = /obj/item/storage/holster/backholster/rpg/som/war_crimes - l_store = /obj/item/storage/pouch/grenade/som + l_pocket = /obj/item/storage/pouch/grenade/som /datum/outfit/quick/som/veteran/rocket_man/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -2089,8 +2079,8 @@ mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som/leader glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader - l_store = /obj/item/storage/pouch/grenade/som/combat_patrol + r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/satchel/som /datum/outfit/quick/som/squad_leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/datums/quick_load_robots.dm b/code/datums/quick_load_robots.dm index f20cd79fce9ab..fdd6ba4e578dc 100644 --- a/code/datums/quick_load_robots.dm +++ b/code/datums/quick_load_robots.dm @@ -27,8 +27,8 @@ glasses = null head = /obj/item/clothing/head/modular/robot - l_store = null - r_store = null + l_pocket = null + r_pocket = null back = /obj/item/storage/backpack/marine belt = null @@ -48,8 +48,8 @@ wear_suit = /obj/item/clothing/suit/modular/robot/hodgrenades head = /obj/item/clothing/head/modular/robot/hod - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/storage/pouch/magazine/large + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/magazine/large back = /obj/item/storage/backpack/marine belt = /obj/item/storage/belt/marine @@ -86,8 +86,8 @@ wear_suit = /obj/item/clothing/suit/modular/robot/heavy/tyr_onegeneral head = /obj/item/clothing/head/modular/robot/heavy/tyr - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/storage/pouch/tools + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/tools back = /obj/item/storage/backpack/marine belt = /obj/item/storage/belt/sparepouch @@ -122,8 +122,8 @@ wear_suit = /obj/item/clothing/suit/modular/robot/lightgeneral head = /obj/item/clothing/head/modular/robot - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/storage/pouch/magazine/large + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/magazine/large back = /obj/item/storage/backpack/marine belt = /obj/item/belt_harness/marine @@ -158,8 +158,8 @@ wear_suit = /obj/item/clothing/suit/modular/robot/lightgeneral head = /obj/item/clothing/head/modular/robot - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/storage/pouch/shotgun + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/shotgun back = /obj/item/storage/backpack/marine belt = /obj/item/storage/belt/shotgun @@ -196,8 +196,8 @@ wear_suit = /obj/item/clothing/suit/modular/robot/lightgeneral head = /obj/item/clothing/head/modular/robot - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/cell/lasgun/volkite/powerpack/marine + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/cell/lasgun/volkite/powerpack/marine back = /obj/item/storage/backpack/marine belt = /obj/item/storage/belt/marine @@ -234,8 +234,8 @@ glasses = /obj/item/clothing/glasses/meson head = /obj/item/clothing/head/modular/robot/heavy - l_store = /obj/item/storage/pouch/tools - r_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/tools + r_pocket = /obj/item/storage/pouch/grenade back = /obj/item/storage/backpack/marine/radiopack belt = /obj/item/belt_harness/marine @@ -286,8 +286,8 @@ glasses = /obj/item/clothing/glasses/meson head = /obj/item/clothing/head/modular/robot - l_store = /obj/item/storage/pouch/tools - r_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/tools + r_pocket = /obj/item/storage/pouch/grenade back = /obj/item/storage/holster/backholster/flamer belt = /obj/item/storage/belt/marine @@ -337,8 +337,8 @@ glasses = /obj/item/clothing/glasses/meson head = /obj/item/clothing/head/modular/robot - l_store = /obj/item/storage/pouch/tools - r_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/tools + r_pocket = /obj/item/storage/pouch/grenade back = /obj/item/storage/backpack/marine/satchel belt = /obj/item/belt_harness/marine @@ -387,8 +387,8 @@ glasses = /obj/item/clothing/glasses/hud/health head = /obj/item/clothing/head/modular/robot - l_store = /obj/item/storage/pouch/shotgun - r_store = /obj/item/storage/pouch/medkit/medic + l_pocket = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/medkit/medic back = /obj/item/storage/backpack/marine/corpsman belt = /obj/item/storage/belt/lifesaver/beginner @@ -441,8 +441,8 @@ glasses = /obj/item/clothing/glasses/hud/health head = /obj/item/clothing/head/modular/robot/light - l_store = /obj/item/storage/pouch/shotgun - r_store = /obj/item/storage/pouch/medkit/medic + l_pocket = /obj/item/storage/pouch/shotgun + r_pocket = /obj/item/storage/pouch/medkit/medic back = /obj/item/storage/backpack/marine/corpsman belt = /obj/item/storage/belt/hypospraybelt/beginner @@ -492,8 +492,8 @@ glasses = /obj/item/clothing/glasses/night/m56_goggles head = /obj/item/clothing/head/modular/robot/antenna - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/grenade back = /obj/item/storage/backpack/marine/satchel belt = /obj/item/belt_harness/marine @@ -531,8 +531,8 @@ glasses = /obj/item/clothing/glasses/night/m56_goggles head = /obj/item/clothing/head/modular/robot/antenna - l_store = /obj/item/storage/holster/flarepouch/full - r_store = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/holster/flarepouch/full + r_pocket = /obj/item/storage/pouch/grenade back = /obj/item/ammo_magazine/minigun_powerpack/smartgun belt = /obj/item/belt_harness/marine diff --git a/code/game/area/bigred.dm b/code/game/area/bigred.dm index 1b83db40664b9..4b410d1ce851e 100644 --- a/code/game/area/bigred.dm +++ b/code/game/area/bigred.dm @@ -144,7 +144,7 @@ outside = FALSE minimap_color = MINIMAP_AREA_REQ -/area/bigredv2/outside/general_store +/area/bigredv2/outside/general_pocket name = "General Store" icon_state = "blueold" ceiling = CEILING_METAL diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 672b8915ab99c..88a70d7dc4855 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -611,7 +611,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return FALSE equip_to_slot = TRUE if(SLOT_L_STORE) - if(H.l_store) + if(H.l_pocket) return FALSE if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) @@ -621,7 +621,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return TRUE equip_to_slot = TRUE if(SLOT_R_STORE) - if(H.r_store) + if(H.r_pocket) return FALSE if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) @@ -649,9 +649,9 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(SLOT_IN_BELT) selected_slot = H.belt if(SLOT_IN_L_POUCH) - selected_slot = H.l_store + selected_slot = H.l_pocket if(SLOT_IN_R_POUCH) - selected_slot = H.r_store + selected_slot = H.r_pocket if(SLOT_IN_SUIT) selected_slot = H.wear_suit if(SLOT_IN_HEAD) diff --git a/code/game/objects/machinery/buttons.dm b/code/game/objects/machinery/buttons.dm index 0f4d97adddbcb..3b6e0148e8de9 100644 --- a/code/game/objects/machinery/buttons.dm +++ b/code/game/objects/machinery/buttons.dm @@ -291,8 +291,7 @@ if(istype(type, /datum/outfit)) continue var/datum/outfit/out = type - if(initial(out.can_be_admin_equipped)) - job_outfits[initial(out.name)] = out + job_outfits[initial(out.name)] = out job_outfits = sortList(job_outfits) job_outfits.Insert(1, "Naked") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index d5937fd56f42d..c76a50c8e889f 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1978,9 +1978,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] var/list/job_outfits = list() for(var/path in job_paths) var/datum/outfit/O = path - if(initial(O.can_be_admin_equipped)) - var/outfit_name = initial(O.name) - job_outfits[outfit_name] = path + job_outfits[initial(O.name)] = path var/list/picker = sortList(job_outfits) picker.Insert(1, "{Naked}") diff --git a/code/modules/admin/verbs/selectequipment.dm b/code/modules/admin/verbs/selectequipment.dm index 0bc514425c26b..0a6687fbe8365 100644 --- a/code/modules/admin/verbs/selectequipment.dm +++ b/code/modules/admin/verbs/selectequipment.dm @@ -210,7 +210,7 @@ qdel(target) else human_target = target - if(human_target.l_store || human_target.r_store || human_target.s_store) //saves a lot of time for admins and coders alike + if(human_target.l_pocket || human_target.r_pocket || human_target.s_store) //saves a lot of time for admins and coders alike if(tgui_alert(usr,"Drop Items in Pockets? No will delete them.", "Robust quick dress shop", list("Yes", "No")) == "No") delete_pocket = TRUE diff --git a/code/modules/clothing/outfits/vv_outfit.dm b/code/modules/clothing/outfits/vv_outfit.dm index 2b04173638dd6..41f58f68ddb65 100644 --- a/code/modules/clothing/outfits/vv_outfit.dm +++ b/code/modules/clothing/outfits/vv_outfit.dm @@ -37,9 +37,9 @@ if(SLOT_S_STORE) suit_store = item_path if(SLOT_L_STORE) - l_store = item_path + l_pocket = item_path if(SLOT_R_STORE) - r_store = item_path + r_pocket = item_path /proc/collect_vv(obj/item/I) diff --git a/code/modules/logging/log_category.dm b/code/modules/logging/log_category.dm index 96849ff02c821..7f048f9e65cbf 100644 --- a/code/modules/logging/log_category.dm +++ b/code/modules/logging/log_category.dm @@ -37,7 +37,7 @@ GENERAL_PROTECT_DATUM(/datum/log_category) category = LOG_CATEGORY_NOT_FOUND /// Add an entry to this category. It is very important that any data you provide doesn't hold references to anything! -/datum/log_category/proc/create_entry(message, list/data, list/semver_store) +/datum/log_category/proc/create_entry(message, list/data, list/semver_pocket) var/datum/log_entry/entry = new( // world state contains raw timestamp timestamp = logger.human_readable_timestamp(), @@ -45,7 +45,7 @@ GENERAL_PROTECT_DATUM(/datum/log_category) message = message, flags = entry_flags, data = data, - semver_store = semver_store, + semver_pocket = semver_pocket, ) write_entry(entry) diff --git a/code/modules/logging/log_entry.dm b/code/modules/logging/log_entry.dm index 3de4e543d1a1f..f5edf39502ff4 100644 --- a/code/modules/logging/log_entry.dm +++ b/code/modules/logging/log_entry.dm @@ -2,7 +2,7 @@ // Schema version must always be the very last element in the array. // Current Schema: 1.0.0 -// [timestamp, category, message, data, world_state, semver_store, id, schema_version] +// [timestamp, category, message, data, world_state, semver_pocket, id, schema_version] /// A datum which contains log information. /datum/log_entry @@ -32,11 +32,11 @@ var/list/data /// Semver store of the log entry, used to store the schema of data entries - var/list/semver_store + var/list/semver_pocket GENERAL_PROTECT_DATUM(/datum/log_entry) -/datum/log_entry/New(timestamp, category, message, flags, list/data, list/semver_store) +/datum/log_entry/New(timestamp, category, message, flags, list/data, list/semver_pocket) ..() src.id = next_id++ @@ -45,7 +45,7 @@ GENERAL_PROTECT_DATUM(/datum/log_entry) src.flags = flags src.message = message with_data(data) - with_semver_store(semver_store) + with_semver_pocket(semver_pocket) /datum/log_entry/proc/with_data(list/data) if(!isnull(data)) @@ -56,13 +56,13 @@ GENERAL_PROTECT_DATUM(/datum/log_entry) src.data = data return src -/datum/log_entry/proc/with_semver_store(list/semver_store) - if(isnull(semver_store)) +/datum/log_entry/proc/with_semver_pocket(list/semver_pocket) + if(isnull(semver_pocket)) return - if(!islist(semver_store)) - stack_trace("Log entry semver store was not a list, it was [semver_store.type]. We cannot reliably convert it to a list.") + if(!islist(semver_pocket)) + stack_trace("Log entry semver store was not a list, it was [semver_pocket.type]. We cannot reliably convert it to a list.") else - src.semver_store = semver_store + src.semver_pocket = semver_pocket return src /// Converts the log entry to a human-readable string. @@ -88,7 +88,7 @@ GENERAL_PROTECT_DATUM(/datum/log_entry) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_MESSAGE, message) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_DATA, data) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_WORLD_STATE, world.get_world_state_for_logging()) - MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SEMVER_STORE, semver_store) + MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SEMVER_STORE, semver_pocket) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_ID, id) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SCHEMA_VERSION, schema_version) return "{[json_entries.Join(",")]}" diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm index 6c9e24c755eb7..0762124071076 100644 --- a/code/modules/logging/log_holder.dm +++ b/code/modules/logging/log_holder.dm @@ -92,7 +92,7 @@ GENERAL_PROTECT_DATUM(/datum/log_holder) "message" = entry.message, "timestamp" = entry.timestamp, "data" = entry.data, - "semver" = entry.semver_store, + "semver" = entry.semver_pocket, )) category_data["entries"] = entries category_data["entry_count"] = category.entry_count @@ -293,11 +293,11 @@ GENERAL_PROTECT_DATUM(/datum/log_holder) Log(LOG_CATEGORY_NOT_FOUND, message, data) CRASH("Attempted to log to a category that doesn't exist! [category]") - var/list/semver_store = null + var/list/semver_pocket = null if(length(data)) - semver_store = list() - data = recursive_jsonify(data, semver_store) - log_category.create_entry(message, data, semver_store) + semver_pocket = list() + data = recursive_jsonify(data, semver_pocket) + log_category.create_entry(message, data, semver_pocket) /// Recursively converts an associative list of datums into their jsonified(list) form /datum/log_holder/proc/recursive_jsonify(list/data_list, list/semvers) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index a6b082e3b567e..45ce177b846d2 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -347,7 +347,7 @@ /mob/living/carbon/human/get_equipped_items(include_pockets = FALSE) var/list/items = ..() if(!include_pockets) - items -= list(l_store, r_store) + items -= list(l_pocket, r_pocket) return items ///Find the slot an item is equipped to and returns its slot define diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 774cf3c7c0471..42a1a0cd5520f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -87,9 +87,9 @@ ///The ID being worn. var/obj/item/card/id/wear_id ///The item currently in the right pocket - var/obj/item/r_store + var/obj/item/r_pocket ///The item currently in the left pocket - var/obj/item/l_store + var/obj/item/l_pocket ///The current standing icon var/icon/stand_icon diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index f50534ca9b3d9..add8358fd82fc 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -151,10 +151,10 @@ update_inv_wear_suit() . = ITEM_UNEQUIP_UNEQUIPPED else if(I == w_uniform) - if(r_store) - dropItemToGround(r_store) - if(l_store) - dropItemToGround(l_store) + if(r_pocket) + dropItemToGround(r_pocket) + if(l_pocket) + dropItemToGround(l_pocket) if(belt) dropItemToGround(belt) if(wear_suit && istype(wear_suit, /obj/item/clothing/suit)) @@ -217,13 +217,13 @@ update_inv_wear_id() name = get_visible_name() . = ITEM_UNEQUIP_UNEQUIPPED - else if (I == r_store) - r_store = null + else if (I == r_pocket) + r_pocket = null I.unequipped(src, SLOT_R_STORE) update_inv_pockets() . = ITEM_UNEQUIP_UNEQUIPPED - else if (I == l_store) - l_store = null + else if (I == l_pocket) + l_pocket = null I.unequipped(src, SLOT_L_STORE) update_inv_pockets() . = ITEM_UNEQUIP_UNEQUIPPED @@ -330,11 +330,11 @@ item_to_equip.equipped(src, slot) update_inv_w_uniform() if(SLOT_L_STORE) - l_store = item_to_equip + l_pocket = item_to_equip item_to_equip.equipped(src, slot) update_inv_pockets() if(SLOT_R_STORE) - r_store = item_to_equip + r_pocket = item_to_equip item_to_equip.equipped(src, slot) update_inv_pockets() if(SLOT_S_STORE) @@ -360,9 +360,9 @@ if(SLOT_IN_STORAGE) selected_slot = s_active if(SLOT_IN_L_POUCH) - selected_slot = l_store + selected_slot = l_pocket if(SLOT_IN_R_POUCH) - selected_slot = r_store + selected_slot = r_pocket if(SLOT_IN_ACCESSORY) selected_slot = w_uniform else @@ -419,9 +419,9 @@ if(SLOT_W_UNIFORM) return w_uniform if(SLOT_L_STORE) - return l_store + return l_pocket if(SLOT_R_STORE) - return r_store + return r_pocket if(SLOT_S_STORE) return s_store if(SLOT_HANDCUFFED) @@ -441,9 +441,9 @@ if(SLOT_IN_ACCESSORY) return w_uniform if(SLOT_IN_L_POUCH) - return l_store + return l_pocket if(SLOT_IN_R_POUCH) - return r_store + return r_pocket if(SLOT_IN_HEAD) return head @@ -472,9 +472,9 @@ if(ITEM_SLOT_BACK) return back if(ITEM_SLOT_R_POCKET) - return r_store + return r_pocket if(ITEM_SLOT_L_POCKET) - return l_store + return l_pocket if(ITEM_SLOT_SUITSTORE) return s_store if(ITEM_SLOT_HANDCUFF) @@ -506,9 +506,9 @@ . = SLOT_EARS else if(equipped_item == wear_id) . = SLOT_WEAR_ID - else if(equipped_item == r_store) + else if(equipped_item == r_pocket) . = SLOT_R_STORE - else if(equipped_item == l_store) + else if(equipped_item == l_pocket) . = SLOT_L_STORE else if(equipped_item == s_store) . = SLOT_S_STORE diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index bdbb36e524fee..073df9c74fe38 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -727,14 +727,14 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) apply_overlay(SUIT_LAYER) /mob/living/carbon/human/update_inv_pockets() - if(l_store) + if(l_pocket) if(client && hud_used?.hud_shown) - l_store.screen_loc = ui_storage1 - client.screen += l_store - if(r_store) + l_pocket.screen_loc = ui_storage1 + client.screen += l_pocket + if(r_pocket) if(client && hud_used?.hud_shown) - r_store.screen_loc = ui_storage2 - client.screen += r_store + r_pocket.screen_loc = ui_storage2 + client.screen += r_pocket /mob/living/carbon/human/update_inv_wear_mask() diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 8f3ddc05caa88..798882fccb67c 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -17,6 +17,38 @@ update_handcuffed(null) . = ITEM_UNEQUIP_UNEQUIPPED +/mob/living/carbon/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) + . = ..() + + if(!slot) + return + + if(!istype(item_to_equip)) + return + + if(bitslot) + var/oldslot = slot + slot = slotbit2slotdefine(oldslot) + + if(item_to_equip == l_hand) + l_hand = null + item_to_equip.unequipped(src, SLOT_L_HAND) + update_inv_l_hand() + + else if(item_to_equip == r_hand) + r_hand = null + item_to_equip.unequipped(src, SLOT_R_HAND) + update_inv_r_hand() + + for(var/datum/action/A AS in item_to_equip.actions) + A.remove_action(src) + + item_to_equip.screen_loc = null + item_to_equip.loc = src + item_to_equip.layer = ABOVE_HUD_LAYER + item_to_equip.plane = ABOVE_HUD_PLANE + item_to_equip.forceMove(src) + /mob/living/carbon/get_equipped_slot(obj/equipped_item) if(..()) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ee625a63e15e1..95d84e496287d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -250,32 +250,7 @@ *In most cases you will want to use equip_to_slot_if_possible() */ /mob/proc/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) - if(!slot) - return - if(!istype(item_to_equip)) - return - if(bitslot) - var/oldslot = slot - slot = slotbit2slotdefine(oldslot) - - if(item_to_equip == l_hand) - l_hand = null - item_to_equip.unequipped(src, SLOT_L_HAND) - update_inv_l_hand() - - else if(item_to_equip == r_hand) - r_hand = null - item_to_equip.unequipped(src, SLOT_R_HAND) - update_inv_r_hand() - - for(var/datum/action/A AS in item_to_equip.actions) - A.remove_action(src) - - item_to_equip.screen_loc = null - item_to_equip.loc = src - item_to_equip.layer = ABOVE_HUD_LAYER - item_to_equip.plane = ABOVE_HUD_PLANE - item_to_equip.forceMove(src) + return ///This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds starts and when events happen and such. /mob/proc/equip_to_slot_or_del(obj/item/W, slot, override_nodrop = FALSE) From 33402ea3eae2fa7d664c1e1438b181e96f43eb17 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sat, 28 Sep 2024 23:40:32 +0200 Subject: [PATCH 02/17] I am going to explode --- code/__DEFINES/equipment.dm | 13 +- code/datums/elements/strippable.dm | 6 +- code/datums/outfit.dm | 166 ++++++++-- code/game/objects/items.dm | 281 ++++++++-------- code/game/objects/items/handcuffs.dm | 6 +- .../modular_armor/attachments/modules.dm | 2 +- code/modules/clothing/outfits/vv_outfit.dm | 56 +--- code/modules/mob/inventory.dm | 10 +- .../mob/living/carbon/human/_species.dm | 2 +- .../mob/living/carbon/human/inventory.dm | 303 ++++++------------ code/modules/mob/living/carbon/inventory.dm | 14 +- .../living/carbon/xenomorph/facehuggers.dm | 2 +- .../mob/living/carbon/xenomorph/xenomorph.dm | 10 +- code/modules/mob/mob.dm | 37 ++- 14 files changed, 441 insertions(+), 467 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 9e5b88be1c4a6..f24a23a3400ab 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -226,7 +226,7 @@ #define ITEM_SLOT_HANDCUFF (1<<14) //the slot for handcuffs #define ITEM_SLOT_L_HAND (1<<15) //left hand #define ITEM_SLOT_R_HAND (1<<16) //right hand - +#define ITEM_SLOT_ACTIVE_STORAGE (1<<17) // the currently open/active storage container ///Inventory slot bits to plain english strings GLOBAL_LIST_INIT(inventory_slots_to_string, list( @@ -253,6 +253,7 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( //Inventory slots - These are mostly used to get items from certain slots //Text strings so that the slots can be associated when doing inventory lists. +/* #define SLOT_WEAR_ID 1 #define SLOT_EARS 2 #define SLOT_W_UNIFORM 3 @@ -271,18 +272,20 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define SLOT_L_HAND 16 #define SLOT_R_HAND 17 #define SLOT_HANDCUFFED 18 + #define SLOT_IN_BOOT 19//!! #define SLOT_IN_BACKPACK 20//!! #define SLOT_IN_SUIT 21//!! #define SLOT_IN_ACCESSORY 23//!! -#define SLOT_IN_HOLSTER 24// !! -#define SLOT_IN_B_HOLSTER 25// !! -#define SLOT_IN_S_HOLSTER 26// !! -#define SLOT_IN_STORAGE 27// !! +#define SLOT_IN_HOLSTER 24// !! belt holster +#define SLOT_IN_B_HOLSTER 25// !! back holster +#define SLOT_IN_S_HOLSTER 26// !! suit storage holster +#define SLOT_IN_STORAGE 27// !! currently open storage #define SLOT_IN_L_POUCH 28// !! #define SLOT_IN_R_POUCH 29// !! #define SLOT_IN_HEAD 30// !! #define SLOT_IN_BELT 31// !! +*/ //================================================= diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 023298852d75c..0a5134b71f710 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -197,7 +197,7 @@ return null var/mob/mob_source = source - return mob_source.get_item_by_slot_bit(item_slot) + return mob_source.get_item_by_slot(item_slot) /datum/strippable_item/mob_item_slot/try_equip(atom/source, obj/item/equipping, mob/user) . = ..() @@ -207,7 +207,7 @@ if(!ismob(source)) return FALSE - if(!equipping.mob_can_equip(source, item_slot, warning = TRUE, override_nodrop = FALSE, bitslot = TRUE)) + if(!equipping.mob_can_equip(source, item_slot, TRUE, FALSE, FALSE)) to_chat(user, "\The [equipping] doesn't fit in that place!") return FALSE @@ -224,7 +224,7 @@ if(!do_after(user, get_equip_delay(equipping), NONE, source, BUSY_ICON_FRIENDLY)) return FALSE - if(!equipping.mob_can_equip(source, item_slot,warning = TRUE,override_nodrop = FALSE, bitslot = TRUE)) + if(!equipping.mob_can_equip(source, item_slot, TRUE, FALSE, FALSE)) return FALSE if(!user.temporarilyRemoveItemFromInventory(equipping)) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 9a73a09d758d9..4ecbe2dd98585 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -39,81 +39,187 @@ * Format of this list should be: list(path=count,otherpath=count) */ var/list/backpack_contents + /** + * List of items that should go in the belt of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/belt_contents + /** + * List of items that should go in the shoes of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/shoe_contents + /** + * List of items that should go in the suit storage of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/suit_contents + /** + * List of items that should go in the webbing of the user's uniform + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/webbing_contents + /** + * List of items that should go in the headwear of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/head_contents + /** + * List of items that should go in the right pocket container of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/r_pocket_contents + /** + * List of items that should go in the left pocket container of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/l_pocket_contents /// The implants this outfit comes with var/list/implants - ///the species this outfit is designed for var/species = SPECIES_HUMAN +/// This gets ran before we equip any items from the variables /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - //to be overridden for customization depending on client prefs,species etc return +/// This gets ran after we equip any times from the variables, don't use this to put things inside containers /datum/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - //to be overridden for toggling internals, id binding, access etc return -/datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE) - pre_equip(H, visualsOnly) +/datum/outfit/proc/equip(mob/living/carbon/human/equipping_human, visualsOnly = FALSE) + pre_equip(equipping_human, visualsOnly) //Start with uniform,suit,backpack for additional slots if(w_uniform) - H.equip_to_slot_or_del(new w_uniform(H), SLOT_W_UNIFORM, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new w_uniform(equipping_human), SLOT_W_UNIFORM, override_nodrop = TRUE) if(wear_suit) - H.equip_to_slot_or_del(new wear_suit(H), SLOT_WEAR_SUIT, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new wear_suit(equipping_human), SLOT_WEAR_SUIT, override_nodrop = TRUE) if(back) - H.equip_to_slot_or_del(new back(H), SLOT_BACK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new back(equipping_human), SLOT_BACK, override_nodrop = TRUE) if(belt) - H.equip_to_slot_or_del(new belt(H), SLOT_BELT, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new belt(equipping_human), SLOT_BELT, override_nodrop = TRUE) if(gloves) - H.equip_to_slot_or_del(new gloves(H), SLOT_GLOVES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new gloves(equipping_human), SLOT_GLOVES, override_nodrop = TRUE) if(shoes) - H.equip_to_slot_or_del(new shoes(H), SLOT_SHOES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new shoes(equipping_human), SLOT_SHOES, override_nodrop = TRUE) if(head) - H.equip_to_slot_or_del(new head(H), SLOT_HEAD, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new head(equipping_human), SLOT_HEAD, override_nodrop = TRUE) if(mask) - H.equip_to_slot_or_del(new mask(H), SLOT_WEAR_MASK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new mask(equipping_human), SLOT_WEAR_MASK, override_nodrop = TRUE) if(ears) if(visualsOnly) - H.equip_to_slot_or_del(new /obj/item/radio/headset(H), SLOT_EARS, override_nodrop = TRUE) //We don't want marine cameras. For now they have the same worn_icon_state as the rest. + equipping_human.equip_to_slot_or_del(new /obj/item/radio/headset(equipping_human), SLOT_EARS, override_nodrop = TRUE) //We don't want marine cameras. For now they have the same worn_icon_state as the rest. else - H.equip_to_slot_or_del(new ears(H), SLOT_EARS, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new ears(equipping_human), SLOT_EARS, override_nodrop = TRUE) if(glasses) - H.equip_to_slot_or_del(new glasses(H), SLOT_GLASSES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new glasses(equipping_human), SLOT_GLASSES, override_nodrop = TRUE) if(id) - H.equip_to_slot_or_del(new id(H), SLOT_WEAR_ID, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new id(equipping_human), SLOT_WEAR_ID, override_nodrop = TRUE) if(suit_store) - H.equip_to_slot_or_del(new suit_store(H), SLOT_S_STORE, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new suit_store(equipping_human), SLOT_S_STORE, override_nodrop = TRUE) if(l_hand) - H.put_in_l_hand(new l_hand(H)) + equipping_human.put_in_l_hand(new l_hand(equipping_human)) if(r_hand) - H.put_in_r_hand(new r_hand(H)) + equipping_human.put_in_r_hand(new r_hand(equipping_human)) if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - H.equip_to_slot_or_del(new l_pocket(H), SLOT_L_STORE, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new l_pocket(equipping_human), SLOT_L_STORE, override_nodrop = TRUE) if(r_pocket) - H.equip_to_slot_or_del(new r_pocket(H), SLOT_R_STORE, override_nodrop = TRUE) - + equipping_human.equip_to_slot_or_del(new r_pocket(equipping_human), SLOT_R_STORE, override_nodrop = TRUE) + // Big todo for the below lists, there should be a unit test that checks if we ever go over capacity of the container if(backpack_contents) + if(!equipping_human.back) + CRASH("backpack_contents list without a backpack specified in outfit of type [type]!") for(var/path in backpack_contents) var/number = backpack_contents[path] if(!isnum(number))//Default to 1 number = 1 for(var/i in 1 to number) - H.equip_to_slot_or_del(new path(H), SLOT_IN_BACKPACK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_BACK, TRUE, TRUE) + if(belt_contents) + if(!equipping_human.belt) + CRASH("belt_contents list without a belt specified in outfit of type [type]!") + for(var/path in belt_contents) + var/number = belt_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_BELT, TRUE, TRUE) + if(shoe_contents) + if(!equipping_human.shoes) + CRASH("shoe_contents list without shoes specified in outfit of type [type]!") + for(var/path in shoe_contents) + var/number = shoe_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_FEET, TRUE, TRUE) + if(suit_contents) + if(!equipping_human.wear_suit) + CRASH("suit_contents list without a suit specified in outfit of type [type]!") + for(var/path in suit_contents) + var/number = suit_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_OCLOTHING, TRUE, TRUE) + if(webbing_contents) + if(!equipping_human.w_uniform) + CRASH("webbing_contents list without a uniform specified in outfit of type [type]!") + for(var/path in webbing_contents) + var/number = webbing_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_ICLOTHING, TRUE, TRUE) + if(head_contents) + if(!equipping_human.head) + CRASH("head_contents list without headwear specified in outfit of type [type]!") + for(var/path in head_contents) + var/number = head_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_HEAD, TRUE, TRUE) + if(r_pocket_contents) + if(!equipping_human.r_pocket) + CRASH("r_pocket_contents list without right pocket container specified in outfit of type [type]!") + for(var/path in r_pocket_contents) + var/number = r_pocket_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_R_POCKET, TRUE, TRUE) + if(l_pocket_contents) + if(!equipping_human.l_pocket) + CRASH("l_pocket_contents list without left pocket container specified in outfit of type [type]!") + for(var/path in l_pocket_contents) + var/number = l_pocket_contents[path] + if(!isnum(number))//Default to 1 + number = 1 + for(var/i in 1 to number) + equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_L_POCKET, TRUE, TRUE) - post_equip(H, visualsOnly) + post_equip(equipping_human, visualsOnly) - if(implants && implants.len) + if(length(implants)) for(var/implant_type in implants) - var/obj/item/implant/implanter = new implant_type(H) - implanter.implant(H) + var/obj/item/implant/implanter = new implant_type(equipping_human) + implanter.implant(equipping_human) - H.update_body() + equipping_human.update_body() return TRUE @@ -137,7 +243,7 @@ .["suit_store"] = suit_store .["r_hand"] = r_hand .["l_hand"] = l_hand - .["backpack_contents"] = backpack_contents + .["backpack_contents"] = backpack_contents // ivan todo implement the other contents lists .["implants"] = implants /// Copy most vars from another outfit to this one diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 88a70d7dc4855..afbd631513419 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -450,7 +450,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan ///Called when an item is removed from an equipment slot. The loc should still be in the unequipper. -/obj/item/proc/unequipped(mob/unequipper, slot) +/obj/item/proc/unequipped(mob/unequipper, slot) ///todo look at SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_UNEQUIPPED, unequipper, slot) @@ -494,13 +494,16 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan item_flags &= ~CAN_BUMP_ATTACK /** - * The mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't. - * If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen. - * Set disable_warning to 1 if you wish it to not give you outputs. - * warning_text is used in the case that you want to provide a specific warning for why the item cannot be equipped. - * The bitslot param determines if the flag we've passed is a bitflag or not + * Checks if the mob can equip src to the specified slot + * + * Arguments: + * * user - the mob trying to equip src + * * slot - the slot we're trying to equip to + * * warning - does the user get a warning if the equip fails? + * * override_nodrop - do we take into consideration if the item is nodrop? + * * into_storage - are we trying to put src into a storage item in the slot? */ -/obj/item/proc/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) +/obj/item/proc/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, into_storage) if(!slot || !user) return FALSE @@ -509,191 +512,205 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan to_chat(user, span_notice("[src] is stuck to your hand!")) return FALSE - if(!ishuman(user)) + if(!ishuman(user)) /// apparently other types of mobs are barred from ever having slots return FALSE - var/mob/living/carbon/human/H = user - var/list/mob_equip = list() - if(H.species.hud?.equip_slots) - mob_equip = H.species.hud.equip_slots - - if(bitslot) - var/old_slot = slot - slot = slotbit2slotdefine(old_slot) + var/mob/living/carbon/human/human_user = user + if(!human_user.has_limb_for_slot(slot)) + return + var/list/mob_equip = list() //todo this looks stinky + if(human_user.species.hud?.equip_slots) + mob_equip = human_user.species.hud.equip_slots - if(H.species && !(slot in mob_equip)) + if(human_user.species && !(slot in mob_equip)) return FALSE - if(slot in H.species?.no_equip) - if(!is_type_in_list(H.species, species_exception)) + if(slot in human_user.species?.no_equip) + if(!is_type_in_list(human_user.species, species_exception)) return FALSE - if(issynth(H) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use)) - to_chat(H, span_warning("Your programming prevents you from wearing this.")) + if(issynth(human_user) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use)) + to_chat(human_user, span_warning("Your programming prevents you from wearing this.")) return FALSE - var/obj/item/selected_slot //the item in the specific slot we're trying to insert into - var/equip_to_slot = FALSE + if(into_storage) + switch(slot) + if(ITEM_SLOT_L_HAND) + if(!human_user.l_hand?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_R_HAND) + if(!human_user.r_hand?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_ACTIVE_STORAGE) //open storage + if(!human_user?.s_active?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_ICLOTHING) + if(isclothing(human_user.w_uniform)) + for(var/key AS in human_user.w_uniform.attachments_by_slot) + var/atom/attachment = human_user.w_uniform.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) + return TRUE + return FALSE + if(ITEM_SLOT_BACK) + if(!human_user.back?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_BELT) + if(!human_user.belt?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_L_POCKET) + if(!human_user.l_pocket?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_R_POCKET) + if(!human_user.r_pocket?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_SUITSTORE) + if(!human_user.s_store?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_HEAD) + if(!human_user.head?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + if(ITEM_SLOT_FEET) + if(!human_user.shoes?.storage_datum?.can_be_inserted(src, human_user, FALSE)) + return FALSE + return TRUE + + /// The storage item in the specific slot we're trying to insert into + var/obj/item/selected_storage switch(slot) if(SLOT_L_HAND) - if(H.l_hand) + if(human_user.l_hand) return FALSE return TRUE if(SLOT_R_HAND) - if(H.r_hand) + if(human_user.r_hand) return FALSE return TRUE if(SLOT_HANDCUFFED) - if(H.handcuffed) + if(human_user.handcuffed) return FALSE if(!istype(src, /obj/item/restraints/handcuffs)) return FALSE return TRUE - if(SLOT_IN_STORAGE) //open storage - if(!H.s_active) + if(SLOT_S_STORE) //suit storage uniquely depends on the suit allowed list, so is a bit snowflake + if(human_user.s_store) + return FALSE + if(!human_user.wear_suit && (SLOT_WEAR_SUIT in mob_equip)) + if(warning) + to_chat(human_user, span_warning("You need a suit before you can attach this [name].")) return FALSE - selected_slot = H.s_active + if(is_type_in_list(src, human_user.wear_suit.allowed)) + return TRUE + return FALSE + + // from here on we're properly equipping into the actual slots (respecting equip slot flags) + if(!(equip_slot_flags & slot)) + return FALSE //actual slots - if(SLOT_WEAR_MASK) - if(H.wear_mask) + if(ITEM_SLOT_MASK) + if(human_user.wear_mask) return FALSE - equip_to_slot = TRUE - if(SLOT_BACK) - if(H.back) + if(ITEM_SLOT_BACK) + if(human_user.back) return FALSE - equip_to_slot = TRUE - if(SLOT_GLOVES) - if(H.gloves) + if(ITEM_SLOT_GLOVES) + if(human_user.gloves) return FALSE - equip_to_slot = TRUE - if(SLOT_SHOES) - if(H.shoes) + if(ITEM_SLOT_FEET) + if(human_user.shoes) return FALSE - equip_to_slot = TRUE - if(SLOT_GLASSES) - if(H.glasses) + if(ITEM_SLOT_EYES) + if(human_user.glasses) return FALSE - equip_to_slot = TRUE - if(SLOT_HEAD) - if(H.head) + if(ITEM_SLOT_HEAD) + if(human_user.head) return FALSE - equip_to_slot = TRUE - if(SLOT_EARS) - if(H.wear_ear) + if(ITEM_SLOT_EARS) + if(human_user.wear_ear) return FALSE - equip_to_slot = TRUE - if(SLOT_W_UNIFORM) - if(H.w_uniform) + if(ITEM_SLOT_ICLOTHING) + if(human_user.w_uniform) return FALSE - equip_to_slot = TRUE - if(SLOT_WEAR_ID) - if(H.wear_id) + if(ITEM_SLOT_ID) + if(human_user.wear_id) return FALSE - equip_to_slot = TRUE //direct slots with prerequisites - if(SLOT_WEAR_SUIT) - if(H.wear_suit) + if(ITEM_SLOT_OCLOTHING) + if(human_user.wear_suit) return FALSE - if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE - equip_to_slot = TRUE - if(SLOT_BELT) - if(H.belt) + if(ITEM_SLOT_BELT) + if(human_user.belt) return FALSE - if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE - equip_to_slot = TRUE - if(SLOT_L_STORE) - if(H.l_pocket) + if(ITEM_SLOT_L_POCKET) + if(human_user.l_pocket) return FALSE - if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(w_class <= 2) //smaller or tiny items can all go in pocket slots, larger items require the flag to fit return TRUE - equip_to_slot = TRUE - if(SLOT_R_STORE) - if(H.r_pocket) + if(ITEM_SLOT_R_POCKET) + if(human_user.r_pocket) return FALSE - if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(w_class <= 2) return TRUE - equip_to_slot = TRUE - if(SLOT_S_STORE) //suit storage uniquely depends on the suit allowed list, so is a bit snowflake - if(H.s_store) - return FALSE - if(!H.wear_suit && (SLOT_WEAR_SUIT in mob_equip)) - if(warning) - to_chat(H, span_warning("You need a suit before you can attach this [name].")) - return FALSE - if(is_type_in_list(src, H.wear_suit.allowed)) - return TRUE - return FALSE - - //storage slot defines - if(SLOT_IN_ACCESSORY) - selected_slot = H.w_uniform - if(SLOT_IN_BACKPACK) - selected_slot = H.back - if(SLOT_IN_BELT) - selected_slot = H.belt - if(SLOT_IN_L_POUCH) - selected_slot = H.l_pocket - if(SLOT_IN_R_POUCH) - selected_slot = H.r_pocket - if(SLOT_IN_SUIT) - selected_slot = H.wear_suit - if(SLOT_IN_HEAD) - selected_slot = H.head - if(SLOT_IN_BOOT) - selected_slot = H.shoes - +/*// ivan todo this sucks!!!!!!! //holsters - need to check for specific item types - if(SLOT_IN_B_HOLSTER) - if(!H.back || !istype(H.back, /obj/item/storage/holster)) + if(SLOT_IN_B_HOLSTER) + if(!human_user.back || !istype(human_user.back, /obj/item/storage/holster)) return FALSE - selected_slot = H.back + selected_storage = human_user.back if(SLOT_IN_HOLSTER) - if(!H.belt || (!istype(H.belt,/obj/item/storage/holster))) + if(!human_user.belt || (!istype(human_user.belt, /obj/item/storage/holster))) return FALSE - selected_slot = H.belt + selected_storage = human_user.belt if(SLOT_IN_S_HOLSTER) - if(!H.s_store || (!istype(H.s_store, /obj/item/storage/holster))) + if(!human_user.s_store || (!istype(human_user.s_store, /obj/item/storage/holster))) return FALSE - selected_slot = H.s_store + selected_storage = human_user.s_store else return FALSE //Unsupported slot - if(equip_to_slot) - if(!(equip_slot_flags & slotdefine2slotbit(slot))) - return FALSE - return TRUE - - if(!selected_slot) + if(!selected_storage) return FALSE var/datum/storage/current_storage_datum - if(isdatumstorage(selected_slot)) - current_storage_datum = selected_slot + if(isdatumstorage(selected_storage)) + current_storage_datum = selected_storage - else if(selected_slot.storage_datum) - current_storage_datum = selected_slot.storage_datum + else if(selected_storage.storage_datum) + current_storage_datum = selected_storage.storage_datum - else if(isclothing(selected_slot)) - var/obj/item/clothing/selected_clothing = selected_slot + else if(isclothing(selected_storage)) + var/obj/item/clothing/selected_clothing = selected_storage for(var/key AS in selected_clothing.attachments_by_slot) var/atom/attachment = selected_clothing.attachments_by_slot[key] if(!attachment?.storage_datum) @@ -705,7 +722,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return FALSE return current_storage_datum.can_be_inserted(src, user, warning) - +*/ /// Checks whether the item can be unequipped from owner by stripper. Generates a message on failure and returns TRUE/FALSE /obj/item/proc/canStrip(mob/stripper, mob/owner) if(HAS_TRAIT(src, TRAIT_NODROP)) @@ -991,23 +1008,23 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!ishuman(user)) return TRUE var/safety = user.get_eye_protection() - var/mob/living/carbon/human/H = user - var/datum/internal_organ/eyes/E = H.get_organ_slot(ORGAN_SLOT_EYES) + var/mob/living/carbon/human/human_user = user + var/datum/internal_organ/eyes/E = human_user.get_organ_slot(ORGAN_SLOT_EYES) switch(safety) if(1) E.take_damage(rand(1, 2), TRUE) if(0) E.take_damage(rand(2, 4), TRUE) if(-1) - H.blur_eyes(rand(12,20)) + human_user.blur_eyes(rand(12,20)) E.take_damage(rand(12, 16), TRUE) if(safety<2) if(E.damage >= E.min_broken_damage) - to_chat(H, span_danger("You can't see anything!")) - H.blind_eyes(1) + to_chat(human_user, span_danger("You can't see anything!")) + human_user.blind_eyes(1) else if (E.damage >= E.min_bruised_damage) - to_chat(H, span_warning("Your eyes are really starting to hurt. This can't be good for you!")) - H.blind_eyes(5) + to_chat(human_user, span_warning("Your eyes are really starting to hurt. This can't be good for you!")) + human_user.blind_eyes(5) else switch(safety) if(1) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index e5ac03a04b336..d26c1243409d9 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -35,7 +35,7 @@ return var/mob/living/carbon/human/H = target - if (!H.has_limb_for_slot(SLOT_HANDCUFFED)) + if (!H.has_limb_for_slot(ITEM_SLOT_HANDCUFF)) to_chat(user, span_warning("\The [H] needs at least two wrists before you can cuff them together!")) return @@ -43,9 +43,9 @@ user.visible_message(span_notice("[user] tries to put [src] on [H].")) if(do_after(user, cuff_delay, NONE, H, BUSY_ICON_HOSTILE, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(user, TYPE_PROC_REF(/datum, Adjacent), H)) && !H.handcuffed) - if(H.has_limb_for_slot(SLOT_HANDCUFFED)) + if(H.has_limb_for_slot(ITEM_SLOT_HANDCUFF)) user.dropItemToGround(src) - H.equip_to_slot_if_possible(src, SLOT_HANDCUFFED, 1, 0, 1, 1) + H.equip_to_slot_if_possible(src, ITEM_SLOT_HANDCUFF, 1, 0, 1, 1) return TRUE diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 7cf68934b9553..fa0b6cb794102 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -784,7 +784,7 @@ to_chat(wearer, span_warning("Could not deploy night vision system due to [wearer.head]!")) return - INVOKE_ASYNC(wearer, TYPE_PROC_REF(/mob/living/carbon/human, equip_to_slot), attached_goggles, SLOT_GLASSES) + INVOKE_ASYNC(wearer, TYPE_PROC_REF(/mob/living/carbon/human, equip_to_slot), attached_goggles, ITEM_SLOT_EYES) ///Called when the parent is unequipped; undeploys the goggles /obj/item/armor_module/module/night_vision/proc/undeploy(datum/source, mob/user, slot) diff --git a/code/modules/clothing/outfits/vv_outfit.dm b/code/modules/clothing/outfits/vv_outfit.dm index 41f58f68ddb65..33309ada5818c 100644 --- a/code/modules/clothing/outfits/vv_outfit.dm +++ b/code/modules/clothing/outfits/vv_outfit.dm @@ -7,61 +7,7 @@ /datum/outfit/varedit/pre_equip(mob/living/carbon/human/H, visualsOnly) H.delete_equipment() //Applying VV to wrong objects is not reccomended. - . = ..() - - -/datum/outfit/varedit/proc/set_equipement_by_slot(slot,item_path) - switch(slot) - if(SLOT_W_UNIFORM) - w_uniform = item_path - if(SLOT_BACK) - back = item_path - if(SLOT_WEAR_SUIT) - wear_suit = item_path - if(SLOT_BELT) - belt = item_path - if(SLOT_GLOVES) - gloves = item_path - if(SLOT_SHOES) - shoes = item_path - if(SLOT_HEAD) - head = item_path - if(SLOT_WEAR_MASK) - mask = item_path - if(SLOT_EARS) - ears = item_path - if(SLOT_GLASSES) - glasses = item_path - if(SLOT_WEAR_ID) - id = item_path - if(SLOT_S_STORE) - suit_store = item_path - if(SLOT_L_STORE) - l_pocket = item_path - if(SLOT_R_STORE) - r_pocket = item_path - - -/proc/collect_vv(obj/item/I) - //Temporary/Internal stuff, do not copy these. - var/static/list/ignored_vars = list("vars","x","y","z","plane","layer","override","animate_movement","pixel_step_size","screen_loc","tip_timer") - - if(istype(I) && I.datum_flags & DF_VAR_EDITED) - var/list/vedits = list() - for(var/varname in I.vars) - if(!I.can_vv_get(varname)) - continue - if(varname in ignored_vars) - continue - var/vval = I.vars[varname] - //Does it even work ? - if(vval == initial(I.vars[varname])) - continue - //Only text/numbers and icons variables to make it less weirdness prone. - if(!istext(vval) && !isnum(vval) && !isicon(vval)) - continue - vedits[varname] = I.vars[varname] - return vedits + return ..() /datum/outfit/varedit/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 45ce177b846d2..6b5b1859c019d 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -353,11 +353,11 @@ ///Find the slot an item is equipped to and returns its slot define /mob/proc/get_equipped_slot(obj/equipped_item) if(equipped_item == l_hand) - . = SLOT_L_HAND + . = ITEM_SLOT_L_HAND else if(equipped_item == r_hand) - . = SLOT_R_HAND + . = ITEM_SLOT_R_HAND else if(equipped_item == wear_mask) - . = SLOT_WEAR_MASK + . = ITEM_SLOT_MASK /mob/living/proc/unequip_everything() var/list/items = list() @@ -432,10 +432,6 @@ /mob/proc/get_item_by_slot(slot_id) return -/// Returns the item in a given bit slot -/mob/proc/get_item_by_slot_bit(slot_bit) - return - //placeholder until tg inventory system /mob/proc/is_holding(obj/item/I) return ((I == l_hand) || (I == r_hand)) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 421269cc22770..89f0005891b14 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -69,7 +69,7 @@ var/knock_out_reduction = 1 ///How much slowdown is innate to our species var/slowdown = 0 - ///Inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example + ///Inventory slots the race can't equip stuff to. Robots cannot wear shoes, for example. var/list/no_equip = list() //----Related to dying in some way diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index add8358fd82fc..35843c417c578 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -9,7 +9,7 @@ if(incapacitated() || lying_angle) return - var/slot_requested = client?.prefs?.quick_equip[quick_equip_slot] || VALID_EQUIP_SLOTS + var/slot_requested = client?.prefs?.quick_equip[quick_equip_slot] || VALID_EQUIP_SLOTS[quick_equip_slot] var/obj/item/I = get_active_held_item() if(!I) //draw item if(next_move > world.time) @@ -25,26 +25,26 @@ if(draw_from_slot_if_possible(slot)) next_move = world.time + 1 return + return - else //store item - if(s_active?.on_attackby(s_active, I, src)) //stored in currently open storage - return TRUE - if(slot_requested) - if(equip_to_slot_if_possible(I, slot_requested, FALSE, FALSE, FALSE)) - return - if(!equip_to_appropriate_slot(I, FALSE)) + if(s_active?.on_attackby(s_active, I, src)) //stored in currently open storage + return TRUE + if(slot_requested) + if(equip_to_slot_if_possible(I, slot_requested, FALSE, FALSE, FALSE)) return - if(hand) - update_inv_l_hand(FALSE) - else - update_inv_r_hand(FALSE) + if(!equip_to_appropriate_slot(I, FALSE)) + return + if(hand) + update_inv_l_hand(FALSE) + else + update_inv_r_hand(FALSE) /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) - for (var/slot in slots) - if (equip_to_slot_if_possible(W, slot, ignore_delay = TRUE, warning = FALSE)) + for(var/slot in slots) + if(equip_to_slot_if_possible(W, slot, ignore_delay = TRUE, warning = FALSE)) return slot - if (del_on_fail) + if(del_on_fail) qdel(W) return null @@ -55,77 +55,52 @@ if(E.body_part == org_name) return !(E.limb_status & LIMB_DESTROYED) +/// Does src have the appropriate limbs to equip to the provided slot? /mob/living/carbon/human/proc/has_limb_for_slot(slot) switch(slot) - if(SLOT_BACK) + if(ITEM_SLOT_BACK) return has_limb(CHEST) - if(SLOT_WEAR_MASK) + if(ITEM_SLOT_MASK) return has_limb(HEAD) - if(SLOT_HANDCUFFED) + if(ITEM_SLOT_HANDCUFF) return has_limb(HAND_LEFT) && has_limb(HAND_RIGHT) - if(SLOT_L_HAND) + if(ITEM_SLOT_L_HAND) return has_limb(HAND_LEFT) - if(SLOT_R_HAND) + if(ITEM_SLOT_R_HAND) return has_limb(HAND_RIGHT) - if(SLOT_BELT) + if(ITEM_SLOT_BELT) return has_limb(CHEST) - if(SLOT_WEAR_ID) + if(ITEM_SLOT_ID) return TRUE - if(SLOT_EARS) + if(ITEM_SLOT_EARS) return has_limb(HEAD) - if(SLOT_GLASSES) + if(ITEM_SLOT_EYES) return has_limb(HEAD) - if(SLOT_GLOVES) + if(ITEM_SLOT_GLOVES) return has_limb(HAND_LEFT) && has_limb(HAND_RIGHT) - if(SLOT_HEAD) + if(ITEM_SLOT_HEAD) return has_limb(HEAD) - if(SLOT_SHOES) - return has_limb(FOOT_RIGHT) && has_limb(FOOT_LEFT) - if(SLOT_WEAR_SUIT) - return has_limb(CHEST) - if(SLOT_W_UNIFORM) - return has_limb(CHEST) - if(SLOT_L_STORE) - return has_limb(CHEST) - if(SLOT_R_STORE) - return has_limb(CHEST) - if(SLOT_S_STORE) - return has_limb(CHEST) - if(SLOT_ACCESSORY) - return has_limb(CHEST) - if(SLOT_IN_BOOT) + if(ITEM_SLOT_FEET) return has_limb(FOOT_RIGHT) && has_limb(FOOT_LEFT) - if(SLOT_IN_BACKPACK) - return has_limb(CHEST) - if(SLOT_IN_SUIT) - return has_limb(CHEST) - if(SLOT_IN_BELT) - return has_limb(CHEST) - if(SLOT_IN_HEAD) - return has_limb(HEAD) - if(SLOT_IN_ACCESSORY) - return has_limb(CHEST) - if(SLOT_IN_HOLSTER) + if(ITEM_SLOT_OCLOTHING) return has_limb(CHEST) - if(SLOT_IN_S_HOLSTER) + if(ITEM_SLOT_ICLOTHING) return has_limb(CHEST) - if(SLOT_IN_B_HOLSTER) + if(ITEM_SLOT_L_POCKET) return has_limb(CHEST) - if(SLOT_IN_STORAGE) - return TRUE - if(SLOT_IN_L_POUCH) + if(ITEM_SLOT_R_POCKET) return has_limb(CHEST) - if(SLOT_IN_R_POUCH) + if(ITEM_SLOT_SUITSTORE) return has_limb(CHEST) /mob/living/carbon/human/put_in_l_hand(obj/item/W) - var/datum/limb/O = get_limb("l_hand") + var/datum/limb/O = get_limb(BODY_ZONE_PRECISE_L_HAND) if(!O?.is_usable()) return FALSE . = ..() /mob/living/carbon/human/put_in_r_hand(obj/item/W) - var/datum/limb/O = get_limb("r_hand") + var/datum/limb/O = get_limb(BODY_ZONE_PRECISE_R_HAND) if(!O?.is_usable()) return FALSE . = ..() @@ -246,58 +221,89 @@ //This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() -//set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc. -/mob/living/carbon/human/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) +/mob/living/carbon/human/equip_to_slot(obj/item/item_to_equip, slot, into_storage) . = ..() - if(!has_limb_for_slot(slot)) - return - var/obj/item/selected_slot //the item in the specific slot we're trying to insert into, if applicable + if(into_storage) + var/obj/item/selected_storage_target + switch(slot) + if(ITEM_SLOT_FEET) + selected_storage_target = shoes + if(ITEM_SLOT_BACK) + selected_storage_target = back + if(ITEM_SLOT_SUITSTORE) + selected_storage_target = s_store + if(ITEM_SLOT_OCLOTHING) + selected_storage_target = wear_suit + if(ITEM_SLOT_BELT) + selected_storage_target = belt + if(ITEM_SLOT_HEAD) + selected_storage_target = head + if(ITEM_SLOT_ACTIVE_STORAGE) + selected_storage_target = s_active + if(ITEM_SLOT_L_POCKET) + selected_storage_target = l_pocket + if(ITEM_SLOT_R_POCKET) + selected_storage_target = r_pocket + if(ITEM_SLOT_ICLOTHING) + if(isclothing(w_uniform)) + for(var/key AS in w_uniform.attachments_by_slot) + var/atom/attachment = w_uniform.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + selected_storage_target = attachment + break + + var/datum/storage/selected_storage = selected_storage_target.storage_datum + if(!isdatumstorage(selected_storage)) //probably means can_equip failed its job + to_chat(src, span_warning("Equipping to slot failed, yell at coders.")) + CRASH("Failed to get a valid storage datum from slot [slot] while equipping into container in equip_to_slot!") + return selected_storage.handle_item_insertion(item_to_equip, FALSE, src) switch(slot) - if(SLOT_BACK) + if(ITEM_SLOT_BACK) back = item_to_equip item_to_equip.equipped(src, slot) update_inv_back() - if(SLOT_WEAR_MASK) + if(ITEM_SLOT_MASK) wear_mask = item_to_equip item_to_equip.equipped(src, slot) wear_mask_update(item_to_equip, TRUE) - if(SLOT_HANDCUFFED) + if(ITEM_SLOT_HANDCUFF) update_handcuffed(item_to_equip) - if(SLOT_L_HAND) + if(ITEM_SLOT_L_HAND) l_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_l_hand() - if(SLOT_R_HAND) + if(ITEM_SLOT_R_HAND) r_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_r_hand() - if(SLOT_BELT) + if(ITEM_SLOT_BELT) belt = item_to_equip item_to_equip.equipped(src, slot) update_inv_belt() - if(SLOT_WEAR_ID) + if(ITEM_SLOT_ID) wear_id = item_to_equip item_to_equip.equipped(src, slot) update_inv_wear_id() name = get_visible_name() - if(SLOT_EARS) + if(ITEM_SLOT_EARS) wear_ear = item_to_equip item_to_equip.equipped(src, slot) update_inv_ears() - if(SLOT_GLASSES) + if(ITEM_SLOT_EYES) glasses = item_to_equip item_to_equip.equipped(src, slot) var/obj/item/clothing/glasses/G = item_to_equip if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) update_sight() update_inv_glasses() - if(SLOT_GLOVES) + if(ITEM_SLOT_GLOVES) gloves = item_to_equip item_to_equip.equipped(src, slot) update_inv_gloves() - if(SLOT_HEAD) + if(ITEM_SLOT_HEAD) head = item_to_equip if(head.inv_hide_flags & HIDEFACE) name = get_visible_name() @@ -311,144 +317,39 @@ update_inv_glasses() item_to_equip.equipped(src, slot) update_inv_head() - if(SLOT_SHOES) + if(ITEM_SLOT_FEET) shoes = item_to_equip item_to_equip.equipped(src, slot) update_inv_shoes() - if(SLOT_WEAR_SUIT) + if(ITEM_SLOT_OCLOTHING) wear_suit = item_to_equip if(wear_suit.inv_hide_flags & HIDESHOES) update_inv_shoes() if(wear_suit.inv_hide_flags & HIDEJUMPSUIT) update_inv_w_uniform() - if( wear_suit.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) + if(wear_suit.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR)) update_hair() item_to_equip.equipped(src, slot) update_inv_wear_suit() - if(SLOT_W_UNIFORM) + if(ITEM_SLOT_ICLOTHING) w_uniform = item_to_equip item_to_equip.equipped(src, slot) update_inv_w_uniform() - if(SLOT_L_STORE) + if(ITEM_SLOT_L_POCKET) l_pocket = item_to_equip item_to_equip.equipped(src, slot) update_inv_pockets() - if(SLOT_R_STORE) + if(ITEM_SLOT_R_POCKET) r_pocket = item_to_equip item_to_equip.equipped(src, slot) update_inv_pockets() - if(SLOT_S_STORE) + if(ITEM_SLOT_SUITSTORE) s_store = item_to_equip item_to_equip.equipped(src, slot) update_inv_s_store() - if(SLOT_IN_BOOT) - selected_slot = shoes - if(SLOT_IN_BACKPACK) - selected_slot = back - if(SLOT_IN_SUIT) - selected_slot = wear_suit - if(SLOT_IN_BELT) - selected_slot = belt - if(SLOT_IN_HEAD) - selected_slot = head - if(SLOT_IN_HOLSTER) - selected_slot = belt - if(SLOT_IN_B_HOLSTER) - selected_slot = back - if(SLOT_IN_S_HOLSTER) - selected_slot = s_store - if(SLOT_IN_STORAGE) - selected_slot = s_active - if(SLOT_IN_L_POUCH) - selected_slot = l_pocket - if(SLOT_IN_R_POUCH) - selected_slot = r_pocket - if(SLOT_IN_ACCESSORY) - selected_slot = w_uniform - else - CRASH("[src] tried to equip [item_to_equip] to [slot] in equip_to_slot().") - - if(!selected_slot) - return FALSE - - var/datum/storage/selected_storage - if(isdatumstorage(selected_slot)) - selected_storage = selected_slot - else if(selected_slot.storage_datum) - selected_storage = selected_slot.storage_datum - else if(isclothing(selected_slot)) - var/obj/item/clothing/selected_clothing = selected_slot - for(var/key AS in selected_clothing.attachments_by_slot) - var/atom/attachment = selected_clothing.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - selected_storage = attachment.storage_datum - break - - if(!selected_storage) - return FALSE - - return selected_storage.handle_item_insertion(item_to_equip, FALSE, src) /mob/living/carbon/human/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_BACK) - return back - if(SLOT_WEAR_MASK) - return wear_mask - if(SLOT_BELT) - return belt - if(SLOT_WEAR_ID) - return wear_id - if(SLOT_EARS) - return wear_ear - if(SLOT_GLASSES) - return glasses - if(SLOT_GLOVES) - return gloves - if(SLOT_L_HAND) - return l_hand - if(SLOT_R_HAND) - return r_hand - if(SLOT_HEAD) - return head - if(SLOT_SHOES) - return shoes - if(SLOT_WEAR_SUIT) - return wear_suit - if(SLOT_W_UNIFORM) - return w_uniform - if(SLOT_L_STORE) - return l_pocket - if(SLOT_R_STORE) - return r_pocket - if(SLOT_S_STORE) - return s_store - if(SLOT_HANDCUFFED) - return handcuffed - if(SLOT_IN_BOOT) - return shoes - if(SLOT_IN_B_HOLSTER) - return back - if(SLOT_IN_BELT) - return belt - if(SLOT_IN_HOLSTER) - return belt - if(SLOT_IN_STORAGE) - return wear_suit - if(SLOT_IN_S_HOLSTER) - return s_store - if(SLOT_IN_ACCESSORY) - return w_uniform - if(SLOT_IN_L_POUCH) - return l_pocket - if(SLOT_IN_R_POUCH) - return r_pocket - if(SLOT_IN_HEAD) - return head - -/mob/living/carbon/human/get_item_by_slot_bit(slot_bit) - switch(slot_bit) if(ITEM_SLOT_OCLOTHING) return wear_suit if(ITEM_SLOT_ICLOTHING) @@ -489,31 +390,31 @@ return if(equipped_item == wear_suit) - . = SLOT_WEAR_SUIT + . = ITEM_SLOT_OCLOTHING else if(equipped_item == w_uniform) - . = SLOT_W_UNIFORM + . = ITEM_SLOT_ICLOTHING else if(equipped_item == shoes) - . = SLOT_SHOES + . = ITEM_SLOT_FEET else if(equipped_item == belt) - . = SLOT_BELT + . = ITEM_SLOT_BELT else if(equipped_item == gloves) - . = SLOT_GLOVES + . = ITEM_SLOT_GLOVES else if(equipped_item == glasses) - . = SLOT_GLASSES + . = ITEM_SLOT_EYES else if(equipped_item == head) - . = SLOT_HEAD + . = ITEM_SLOT_HEAD else if(equipped_item == wear_ear) - . = SLOT_EARS + . = ITEM_SLOT_EARS else if(equipped_item == wear_id) - . = SLOT_WEAR_ID + . = ITEM_SLOT_ID else if(equipped_item == r_pocket) - . = SLOT_R_STORE + . = ITEM_SLOT_R_POCKET else if(equipped_item == l_pocket) - . = SLOT_L_STORE + . = ITEM_SLOT_L_POCKET else if(equipped_item == s_store) - . = SLOT_S_STORE + . = ITEM_SLOT_SUITSTORE -/mob/living/carbon/human/stripPanelUnequip(obj/item/I, mob/M, slot_to_process) +/mob/living/carbon/human/stripPanelUnequip(obj/item/I, mob/M, slot_to_process) //todo deal with this if(!I.canStrip(M)) return log_combat(src, M, "attempted to remove [key_name(I)] ([slot_to_process])") diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 798882fccb67c..b37a56b10d52a 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -17,7 +17,7 @@ update_handcuffed(null) . = ITEM_UNEQUIP_UNEQUIPPED -/mob/living/carbon/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) +/mob/living/carbon/equip_to_slot(obj/item/item_to_equip, slot, into_storage) . = ..() if(!slot) @@ -26,18 +26,14 @@ if(!istype(item_to_equip)) return - if(bitslot) - var/oldslot = slot - slot = slotbit2slotdefine(oldslot) - if(item_to_equip == l_hand) l_hand = null - item_to_equip.unequipped(src, SLOT_L_HAND) + item_to_equip.unequipped(src, ITEM_SLOT_L_HAND) update_inv_l_hand() else if(item_to_equip == r_hand) r_hand = null - item_to_equip.unequipped(src, SLOT_R_HAND) + item_to_equip.unequipped(src, ITEM_SLOT_R_HAND) update_inv_r_hand() for(var/datum/action/A AS in item_to_equip.actions) @@ -54,9 +50,9 @@ return if(equipped_item == handcuffed) - . = SLOT_HANDCUFFED + . = ITEM_SLOT_HANDCUFF else if(equipped_item == back) - . = SLOT_BACK + . = ITEM_SLOT_BACK ///called when we get cuffed/uncuffed /mob/living/carbon/proc/update_handcuffed(obj/item/restraints/handcuffs/restraints) diff --git a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm index 5db322f2ef877..9a7e0b51e167e 100644 --- a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm @@ -549,7 +549,7 @@ hugged.visible_message(span_danger("[src] smashes against [hugged]'s [blocked]!")) return FALSE - hugged.equip_to_slot(src, SLOT_WEAR_MASK) + hugged.equip_to_slot(src, ITEM_SLOT_MASK) return TRUE /obj/item/clothing/mask/facehugger/equipped(mob/living/user, slot) diff --git a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm index 7d89916306004..1e8db22e2f308 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm @@ -514,22 +514,22 @@ Returns TRUE when loc_weeds_type changes. Returns FALSE when it doesn’t change AddComponent(/datum/component/jump, _jump_duration = duration, _jump_cooldown = cooldown, _stamina_cost = 0, _jump_height = height, _jump_sound = sound, _jump_flags = flags, _jumper_allow_pass_flags = jump_pass_flags) -/mob/living/carbon/xenomorph/equip_to_slot(obj/item/item_to_equip, slot, bitslot) +/mob/living/carbon/xenomorph/equip_to_slot(obj/item/item_to_equip, slot, into_storage) . = ..() switch(slot) - if(SLOT_BACK) + if(ITEM_SLOT_BACK) back = item_to_equip item_to_equip.equipped(src, slot) update_inv_back() - if(SLOT_L_HAND) + if(ITEM_SLOT_L_HAND) l_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_l_hand() - if(SLOT_R_HAND) + if(ITEM_SLOT_R_HAND) r_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_r_hand() - if(SLOT_WEAR_MASK) + if(ITEM_SLOT_MASK) wear_mask = item_to_equip item_to_equip.equipped(src, slot) wear_mask_update(item_to_equip, TRUE) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 95d84e496287d..3ceee65712e8d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -206,23 +206,31 @@ equip_to_slot_if_possible(W, slot, FALSE) // equiphere -///Attempts to put an item in either hand -/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = FALSE, warning = FALSE, redraw_mob = TRUE) - if(equip_to_slot_if_possible(W, SLOT_L_HAND, TRUE, del_on_fail, warning, redraw_mob)) +/** + * Attempts to put an item in either hand + * + * Arguments: + * * W - item trying to be put into either hand + * * del_on_fail - do we delete the item if we fail to put it into either hand? + * * warning - do we warn the user about the failure? + */ +/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = FALSE, warning = FALSE) + if(equip_to_slot_if_possible(W, ITEM_SLOT_R_HAND, TRUE, del_on_fail, warning, FALSE, FALSE)) return TRUE - else if(equip_to_slot_if_possible(W, SLOT_R_HAND, TRUE, del_on_fail, warning, redraw_mob)) + if(equip_to_slot_if_possible(W, ITEM_SLOT_L_HAND, TRUE, del_on_fail, warning, FALSE, FALSE)) return TRUE return FALSE /** * This is a SAFE proc. Use this instead of equip_to_slot()! * set del_on_fail to have it delete item_to_equip if it fails to equip - * unset redraw_mob to prevent the mob from being redrawn at the end. */ -/mob/proc/equip_to_slot_if_possible(obj/item/item_to_equip, slot, ignore_delay = TRUE, del_on_fail = FALSE, warning = TRUE, redraw_mob = TRUE, override_nodrop = FALSE) +/mob/proc/equip_to_slot_if_possible(obj/item/item_to_equip, slot, ignore_delay = TRUE, del_on_fail = FALSE, warning = TRUE, override_nodrop = FALSE, into_storage) if(!istype(item_to_equip) || QDELETED(item_to_equip)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks return FALSE - if(!item_to_equip.mob_can_equip(src, slot, warning, override_nodrop)) + if(isnull(into_storage) && !!get_item_by_slot(slot)) //if a specific into_storage value isn't provided we try to look for storage in the slot + into_storage = TRUE + if(!item_to_equip.mob_can_equip(src, slot, warning, override_nodrop, into_storage)) if(del_on_fail) qdel(item_to_equip) return FALSE @@ -233,13 +241,13 @@ if(!do_after(src, item_to_equip.equip_delay_self, NONE, item_to_equip, BUSY_ICON_FRIENDLY)) to_chat(src, "You stop putting on \the [item_to_equip]") return FALSE - equip_to_slot(item_to_equip, slot) //This proc should not ever fail. + equip_to_slot(item_to_equip, slot, into_storage) //This proc should not ever fail. //This will unwield items -without- triggering lights. if(CHECK_BITFIELD(item_to_equip.item_flags, TWOHANDED)) item_to_equip.unwield(src) return TRUE else - equip_to_slot(item_to_equip, slot) //This proc should not ever fail. + equip_to_slot(item_to_equip, slot, into_storage) //This proc should not ever fail. //This will unwield items -without- triggering lights. if(CHECK_BITFIELD(item_to_equip.item_flags, TWOHANDED)) item_to_equip.unwield(src) @@ -249,12 +257,13 @@ *This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on whether you can or can't eqip need to be done before! Use mob_can_equip() for that task. *In most cases you will want to use equip_to_slot_if_possible() */ -/mob/proc/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) +/mob/proc/equip_to_slot(obj/item/item_to_equip, slot, into_storage) + SHOULD_CALL_PARENT(TRUE) return ///This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds starts and when events happen and such. -/mob/proc/equip_to_slot_or_del(obj/item/W, slot, override_nodrop = FALSE) - return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, FALSE, override_nodrop) +/mob/proc/equip_to_slot_or_del(obj/item/W, slot, override_nodrop = FALSE, into_storage) + return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, FALSE, override_nodrop, into_storage) /// Tries to equip an item to the slot provided, otherwise tries to put it in hands, if hands are full the item is deleted /mob/proc/equip_to_slot_or_hand(obj/item/W, slot, override_nodrop = FALSE) @@ -281,7 +290,7 @@ if(!I) return FALSE - +/* //This is quite horrible, there's probably a better way to do it. //Each actual inventory slot has more than one slot define associated with it. //The defines below are for specific items in specific slots, which allows for a much more specific draw order, i.e. drawing a weapon from a slot which would otherwise be lower in the order @@ -297,7 +306,7 @@ return FALSE if(slot == SLOT_IN_R_POUCH && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/pouch/pistol)))) return FALSE - +*/ //Sends quick equip signal, if our signal is not handled/blocked we continue to the normal behaviour var/return_value = SEND_SIGNAL(I, COMSIG_ITEM_QUICK_EQUIP, src) switch(return_value) From cec964510777f710548ace7a8bd89ee51887d8ed Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sat, 28 Sep 2024 23:40:51 +0200 Subject: [PATCH 03/17] The great outfit migration --- .../campaign/rewards/campaign_asset_jobs.dm | 605 -------------- code/datums/jobs/job/clf.dm | 471 ----------- code/datums/jobs/job/deathsquad.dm | 192 ----- code/datums/jobs/job/erp.dm | 141 ---- code/datums/jobs/job/freelancers.dm | 305 ------- code/datums/jobs/job/icc.dm | 314 -------- code/datums/jobs/job/imperium.dm | 96 --- code/datums/jobs/job/job.dm | 27 - code/datums/jobs/job/marines.dm | 39 - code/datums/jobs/job/mercenaries.dm | 48 -- code/datums/jobs/job/other.dm | 62 -- code/datums/jobs/job/pmc.dm | 204 ----- code/datums/jobs/job/retired.dm | 63 -- code/datums/jobs/job/sectoid.dm | 61 -- code/datums/jobs/job/shipside.dm | 342 -------- code/datums/jobs/job/skeleton.dm | 44 - code/datums/jobs/job/sons_of_mars_ert.dm | 750 ----------------- code/datums/jobs/job/sons_of_mars_shipside.dm | 159 ---- code/datums/jobs/job/sonsofmars.dm | 33 - code/datums/jobs/job/special_forces.dm | 249 ------ code/datums/jobs/job/survivor.dm | 314 -------- code/datums/jobs/job/upp.dm | 198 ----- code/datums/jobs/job/upp_commando.dm | 140 ---- code/datums/jobs/job/vsd.dm | 712 ---------------- code/datums/{outfit.dm => outfits/_outfit.dm} | 0 code/datums/outfits/campaign_asset.dm | 611 ++++++++++++++ code/datums/outfits/clf.dm | 473 +++++++++++ code/datums/outfits/deathsquad.dm | 192 +++++ code/datums/outfits/erp.dm | 143 ++++ code/datums/outfits/freelancers.dm | 309 +++++++ code/datums/outfits/icc.dm | 314 ++++++++ code/datums/outfits/imperium.dm | 90 +++ code/datums/outfits/job.dm | 24 + code/datums/outfits/marines.dm | 41 + code/datums/outfits/mercenaries.dm | 43 + code/datums/outfits/misc.dm | 57 ++ code/datums/outfits/pmc.dm | 199 +++++ .../{ => outfits}/quick_load_beginners.dm | 0 .../{ => outfits}/quick_load_civil_war.dm | 0 .../{ => outfits}/quick_load_outfits.dm | 0 .../datums/{ => outfits}/quick_load_robots.dm | 0 code/datums/outfits/retired.dm | 67 ++ code/datums/outfits/sectoid.dm | 62 ++ code/datums/outfits/shipside.dm | 351 ++++++++ code/datums/outfits/skeleton.dm | 43 + code/datums/outfits/som.dm | 34 + code/datums/outfits/som_ert.dm | 757 ++++++++++++++++++ code/datums/outfits/som_shipside.dm | 167 ++++ code/datums/outfits/special_forces.dm | 250 ++++++ code/datums/outfits/survivor.dm | 316 ++++++++ code/datums/outfits/upp.dm | 199 +++++ code/datums/outfits/upp_commando.dm | 140 ++++ code/datums/outfits/vsd.dm | 715 +++++++++++++++++ .../clothing => datums}/outfits/vv_outfit.dm | 0 tgmc.dme | 36 +- 55 files changed, 5627 insertions(+), 5575 deletions(-) rename code/datums/{outfit.dm => outfits/_outfit.dm} (100%) create mode 100644 code/datums/outfits/campaign_asset.dm create mode 100644 code/datums/outfits/clf.dm create mode 100644 code/datums/outfits/deathsquad.dm create mode 100644 code/datums/outfits/erp.dm create mode 100644 code/datums/outfits/freelancers.dm create mode 100644 code/datums/outfits/icc.dm create mode 100644 code/datums/outfits/imperium.dm create mode 100644 code/datums/outfits/job.dm create mode 100644 code/datums/outfits/marines.dm create mode 100644 code/datums/outfits/mercenaries.dm create mode 100644 code/datums/outfits/misc.dm create mode 100644 code/datums/outfits/pmc.dm rename code/datums/{ => outfits}/quick_load_beginners.dm (100%) rename code/datums/{ => outfits}/quick_load_civil_war.dm (100%) rename code/datums/{ => outfits}/quick_load_outfits.dm (100%) rename code/datums/{ => outfits}/quick_load_robots.dm (100%) create mode 100644 code/datums/outfits/retired.dm create mode 100644 code/datums/outfits/sectoid.dm create mode 100644 code/datums/outfits/shipside.dm create mode 100644 code/datums/outfits/skeleton.dm create mode 100644 code/datums/outfits/som.dm create mode 100644 code/datums/outfits/som_ert.dm create mode 100644 code/datums/outfits/som_shipside.dm create mode 100644 code/datums/outfits/special_forces.dm create mode 100644 code/datums/outfits/survivor.dm create mode 100644 code/datums/outfits/upp.dm create mode 100644 code/datums/outfits/upp_commando.dm create mode 100644 code/datums/outfits/vsd.dm rename code/{modules/clothing => datums}/outfits/vv_outfit.dm (100%) diff --git a/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm b/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm index a338876517a22..75c0609c39179 100644 --- a/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm +++ b/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm @@ -31,161 +31,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/som/militia/standard/mpi_grenadier, ) -/datum/outfit/job/som/militia/standard - name = "Militia Standard" - jobtype = /datum/job/som/mercenary/militia/standard - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/mainship/som - w_uniform = /obj/item/clothing/under/colonist - shoes = /obj/item/clothing/shoes/marine/clf/full - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - head = /obj/item/clothing/head/strawhat - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pill_bottle/zoom - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/som/militia/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/uzi - belt = /obj/item/storage/belt/knifepouch - suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness - - -/datum/outfit/job/som/militia/standard/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/skorpion - belt = /obj/item/weapon/gun/shotgun/double/sawn - suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - -/datum/outfit/job/som/militia/standard/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/mpi_km - belt = /obj/item/storage/belt/marine/som - suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard - - -/datum/outfit/job/som/militia/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/shotgun - belt = /obj/item/storage/belt/shotgun - suit_store = /obj/item/weapon/gun/shotgun/pump/standard - -/datum/outfit/job/som/militia/standard/shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/fanatic - head = /obj/item/clothing/head/headband/rambo - wear_suit = /obj/item/clothing/suit/storage/marine/boomvest/fast - belt = /obj/item/weapon/gun/shotgun/double/sawn - suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - -/datum/outfit/job/som/militia/standard/fanatic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/som_smg - belt = /obj/item/storage/belt/marine/som - suit_store = /obj/item/weapon/gun/smg/som/basic - - -/datum/outfit/job/som/militia/standard/som_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/standard/mpi_grenadier - belt = /obj/item/storage/belt/marine/som - suit_store = /obj/item/weapon/gun/rifle/mpi_km/black/grenadier - - -/datum/outfit/job/som/militia/standard/mpi_grenadier/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - /datum/job/som/mercenary/militia/medic title = "Militial Medic" paygrade = "militia2" @@ -197,97 +42,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/som/militia/medic/paladin, ) -/datum/outfit/job/som/militia/medic - name = "Militia Medic" - jobtype = /datum/job/som/mercenary/militia/medic - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/lifesaver/full/upp - ears = /obj/item/radio/headset/mainship/som - head = /obj/item/clothing/head/tgmcberet/bloodred - w_uniform = /obj/item/clothing/under/colonist - shoes = /obj/item/clothing/shoes/marine/clf/full - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - glasses = /obj/item/clothing/glasses/hud/health - suit_store = /obj/item/weapon/gun/smg/skorpion - l_pocket = /obj/item/storage/pouch/medical_injectors/medic - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/som/militia/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - -/datum/outfit/job/som/militia/medic/uzi - suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness - r_pocket = /obj/item/storage/holster/flarepouch - -/datum/outfit/job/som/militia/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - -/datum/outfit/job/som/militia/medic/skorpion - suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - r_pocket = /obj/item/storage/holster/flarepouch - -/datum/outfit/job/som/militia/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - -/datum/outfit/job/som/militia/medic/paladin - suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness - r_pocket = /obj/item/storage/pouch/shotgun - -/datum/outfit/job/som/militia/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - /datum/job/som/mercenary/militia/leader title = "Militia Leader" paygrade = "militia3" @@ -301,142 +55,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/som/militia/leader/lmg_d, ) -/datum/outfit/job/som/militia/leader - name = "Militia Leader" - jobtype = /datum/job/som/mercenary/militia/leader - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/mainship/som - w_uniform = /obj/item/clothing/under/colonist/webbing - shoes = /obj/item/clothing/shoes/marine/clf/full - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - head = /obj/item/clothing/head/militia - glasses = /obj/item/clothing/glasses/hud/health - r_pocket = /obj/item/storage/pouch/pistol - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/som/militia/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) - -/datum/outfit/job/som/militia/leader/assault_rifle - suit_store = /obj/item/weapon/gun/rifle/m16/ugl - -/datum/outfit/job/som/militia/leader/assault_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/militia/leader/mpi_km - suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier - belt = /obj/item/storage/belt/marine/som - -/datum/outfit/job/som/militia/leader/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/militia/leader/som_rifle - suit_store = /obj/item/weapon/gun/rifle/som/basic - belt = /obj/item/storage/belt/marine/som - -/datum/outfit/job/som/militia/leader/som_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/militia/leader/upp_rifle - suit_store = /obj/item/weapon/gun/rifle/type71/flamer/standard - -/datum/outfit/job/som/militia/leader/upp_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/militia/leader/lmg_d - suit_store = /obj/item/weapon/gun/rifle/lmg_d/magharness - belt = /obj/item/storage/belt/marine/som - -/datum/outfit/job/som/militia/leader/lmg_d/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - //Freelancers /datum/job/freelancer/standard/campaign_bonus faction = FACTION_TERRAGOV @@ -449,16 +67,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/freelancer/standard/three/campaign, ) -/datum/outfit/job/freelancer/standard/one/campaign - ears = /obj/item/radio/headset/mainship - -/datum/outfit/job/freelancer/standard/two/campaign - ears = /obj/item/radio/headset/mainship - -/datum/outfit/job/freelancer/standard/three/campaign - ears = /obj/item/radio/headset/mainship - - /datum/job/freelancer/medic/campaign_bonus faction = FACTION_TERRAGOV comm_title = "FL" @@ -466,9 +74,6 @@ What you lack in equipment and military training you make up in bravery and conv job_cost = 0 outfit = /datum/outfit/job/freelancer/medic/campaign -/datum/outfit/job/freelancer/medic/campaign - ears = /obj/item/radio/headset/mainship - /datum/job/freelancer/grenadier/campaign_bonus faction = FACTION_TERRAGOV comm_title = "FL" @@ -479,12 +84,6 @@ What you lack in equipment and military training you make up in bravery and conv ) job_cost = 0 -/datum/outfit/job/freelancer/grenadier/one/campaign - ears = /obj/item/radio/headset/mainship - -/datum/outfit/job/freelancer/grenadier/two/campaign - ears = /obj/item/radio/headset/mainship - /datum/job/freelancer/leader/campaign_bonus faction = FACTION_TERRAGOV comm_title = "FL" @@ -495,12 +94,6 @@ What you lack in equipment and military training you make up in bravery and conv ) job_cost = 0 -/datum/outfit/job/freelancer/leader/one/campaign - ears = /obj/item/radio/headset/mainship - -/datum/outfit/job/freelancer/leader/two/campaign - ears = /obj/item/radio/headset/mainship - //PMC /datum/job/pmc/standard/campaign_bonus faction = FACTION_TERRAGOV @@ -509,9 +102,6 @@ What you lack in equipment and military training you make up in bravery and conv job_cost = 0 outfit = /datum/outfit/job/pmc/standard/campaign -/datum/outfit/job/pmc/standard/campaign - ears = /obj/item/radio/headset/mainship - /datum/job/pmc/gunner/campaign_bonus faction = FACTION_TERRAGOV comm_title = "PMC" @@ -519,9 +109,6 @@ What you lack in equipment and military training you make up in bravery and conv job_cost = 0 outfit = /datum/outfit/job/pmc/gunner/campaign -/datum/outfit/job/pmc/gunner/campaign - ears = /obj/item/radio/headset/mainship - /datum/job/pmc/leader/campaign_bonus faction = FACTION_TERRAGOV comm_title = "PMC" @@ -529,9 +116,6 @@ What you lack in equipment and military training you make up in bravery and conv job_cost = 0 outfit = /datum/outfit/job/pmc/leader/campaign -/datum/outfit/job/pmc/leader/campaign - ears = /obj/item/radio/headset/mainship - //ICC /datum/job/icc/standard/campaign_bonus faction = FACTION_SOM @@ -544,15 +128,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/icc/standard/icc_battlecarbine/campaign, ) -/datum/outfit/job/icc/standard/mpi_km/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/icc/standard/icc_pdw/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/icc/standard/icc_battlecarbine/campaign - ears = /obj/item/radio/headset/mainship/som - /datum/job/icc/guard/campaign_bonus faction = FACTION_SOM comm_title = "ICC" @@ -563,11 +138,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/icc/guard/icc_autoshotgun/campaign, ) -/datum/outfit/job/icc/guard/coilgun/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/icc/guard/icc_autoshotgun/campaign - ears = /obj/item/radio/headset/mainship/som /datum/job/icc/medic/campaign_bonus faction = FACTION_SOM @@ -579,12 +149,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/icc/medic/icc_sharpshooter/campaign, ) -/datum/outfit/job/icc/medic/icc_machinepistol/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/icc/medic/icc_sharpshooter/campaign - ears = /obj/item/radio/headset/mainship/som - /datum/job/icc/leader/campaign_bonus faction = FACTION_SOM comm_title = "ICC" @@ -595,12 +159,6 @@ What you lack in equipment and military training you make up in bravery and conv /datum/outfit/job/icc/leader/icc_confrontationrifle/campaign, ) -/datum/outfit/job/icc/leader/trenchgun/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/icc/leader/icc_confrontationrifle/campaign - ears = /obj/item/radio/headset/mainship/som - //TGMC combat robots /datum/job/terragov/squad/standard/campaign_robot title = SQUAD_ROBOT @@ -620,121 +178,6 @@ What you lack in equipment and military training you make up in bravery and conv Your metal body is immune to pain and chemical warfare, and resistant against fire and radiation, although you lack the mobility of your human counterparts. Fight for TGMC, and attempt to achieve all objectives given to you."}) -/datum/outfit/job/tgmc/campaign_robot - name = "Combat robot" - jobtype = /datum/job/terragov/squad/standard/campaign_robot - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/mainship - w_uniform = /obj/item/clothing/under/marine/robotic/black_vest - wear_suit = /obj/item/clothing/suit/modular/robot/heavy/tyr - head = /obj/item/clothing/head/modular/robot/heavy/tyr - r_pocket = /obj/item/storage/pouch/pistol - l_pocket = /obj/item/storage/pouch/grenade/combat_patrol - back = /obj/item/storage/backpack/marine/satchel - - belt = /obj/item/storage/belt/marine/te_cells - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro - -/datum/outfit/job/tgmc/campaign_robot/pre_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - H.set_species("Combat Robot") - -/datum/outfit/job/tgmc/campaign_robot/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - -/datum/outfit/job/tgmc/campaign_robot/machine_gunner - belt = /obj/item/storage/belt/sparepouch - suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner - -/datum/outfit/job/tgmc/campaign_robot/machine_gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - -/datum/outfit/job/tgmc/campaign_robot/guardian - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro - r_hand = /obj/item/weapon/shield/riot/marine - -/datum/outfit/job/tgmc/campaign_robot/guardian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - -/datum/outfit/job/tgmc/campaign_robot/jetpack - wear_suit = /obj/item/clothing/suit/modular/robot/heavy/shield - r_pocket = /obj/item/storage/pouch/magazine/large - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/mag_harness - back = /obj/item/jetpack_marine/heavy - -/datum/outfit/job/tgmc/campaign_robot/jetpack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - -/datum/outfit/job/tgmc/campaign_robot/laser_mg - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol - -/datum/outfit/job/tgmc/campaign_robot/laser_mg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) //VSD /datum/job/vsd/standard/campaign_bonus @@ -749,17 +192,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/vsd/standard/grunt_third/campaign, ) -/datum/outfit/job/vsd/standard/grunt_one/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/standard/ksg/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/standard/grunt_second/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/standard/grunt_third/campaign - ears = /obj/item/radio/headset/mainship/som /datum/job/vsd/spec/campaign_bonus faction = FACTION_SOM @@ -774,21 +206,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/vsd/spec/uslspec_two/campaign, ) -/datum/outfit/job/vsd/spec/flamer/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/spec/demolitionist/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/spec/gunslinger/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/spec/uslspec_one/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/spec/uslspec_two/campaign - ears = /obj/item/radio/headset/mainship/som - /datum/job/vsd/medic/campaign_bonus faction = FACTION_SOM comm_title = "VSD" @@ -799,11 +216,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/vsd/medic/vsd_rifle/campaign, ) -/datum/outfit/job/vsd/medic/ksg/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/medic/vsd_rifle/campaign - ears = /obj/item/radio/headset/mainship/som /datum/job/vsd/engineer/campaign_bonus faction = FACTION_SOM @@ -815,11 +227,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/vsd/engineer/vsd_rifle/campaign, ) -/datum/outfit/job/vsd/engineer/l26/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/engineer/vsd_rifle/campaign - ears = /obj/item/radio/headset/mainship/som /datum/job/vsd/juggernaut/campaign_bonus faction = FACTION_SOM @@ -831,11 +238,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/vsd/eod/campaign, ) -/datum/outfit/job/vsd/juggernaut/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/eod/campaign - ears = /obj/item/radio/headset/mainship/som /datum/job/vsd/leader/campaign_bonus faction = FACTION_SOM @@ -848,11 +250,4 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/vsd/leader/upp_three/campaign, ) -/datum/outfit/job/vsd/leader/one/campaign - ears = /obj/item/radio/headset/mainship/som - -/datum/outfit/job/vsd/leader/two/campaign - ears = /obj/item/radio/headset/mainship/som -/datum/outfit/job/vsd/leader/upp_three/campaign - ears = /obj/item/radio/headset/mainship/som diff --git a/code/datums/jobs/job/clf.dm b/code/datums/jobs/job/clf.dm index 2e4b370b2ace3..57c3d4eac1582 100644 --- a/code/datums/jobs/job/clf.dm +++ b/code/datums/jobs/job/clf.dm @@ -21,163 +21,6 @@ /datum/outfit/job/clf/standard/som_smg, ) -//the base loadout for all clf standards -/datum/outfit/job/clf/standard - name = "CLF Standard" - jobtype = /datum/job/clf/standard - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/colonist - shoes = /obj/item/clothing/shoes/marine/clf/full - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - head = /obj/item/clothing/head/strawhat - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pill_bottle/zoom - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/clf/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/uzi - belt = /obj/item/storage/belt/knifepouch - suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness - - -/datum/outfit/job/clf/standard/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/skorpion - belt = /obj/item/weapon/gun/shotgun/double/sawn - suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - -/datum/outfit/job/clf/standard/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/mpi_km - belt = /obj/item/storage/belt/marine/som - suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard - - -/datum/outfit/job/clf/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/shotgun - belt = /obj/item/storage/belt/shotgun - suit_store = /obj/item/weapon/gun/shotgun/pump/standard - -/datum/outfit/job/clf/standard/shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/fanatic - head = /obj/item/clothing/head/headband/rambo - wear_suit = /obj/item/clothing/suit/storage/marine/boomvest/fast - belt = /obj/item/weapon/gun/shotgun/double/sawn - suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - -/datum/outfit/job/clf/standard/fanatic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/som_smg - belt = /obj/item/storage/belt/marine/som - suit_store = /obj/item/weapon/gun/smg/som/basic - - -/datum/outfit/job/clf/standard/som_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/standard/garand - belt = /obj/item/storage/belt/marine/som - suit_store = /obj/item/weapon/gun/rifle/garand - - -/datum/outfit/job/clf/standard/garand/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) //CLF Medic /datum/job/clf/medic @@ -192,97 +35,6 @@ /datum/outfit/job/clf/medic/paladin, ) -//the base loadout for all clf medics -/datum/outfit/job/clf/medic - name = "CLF Medic" - jobtype = /datum/job/clf/medic - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/lifesaver/full/upp - ears = /obj/item/radio/headset/distress/dutch - head = /obj/item/clothing/head/tgmcberet/bloodred - w_uniform = /obj/item/clothing/under/colonist - shoes = /obj/item/clothing/shoes/marine/clf/full - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - glasses = /obj/item/clothing/glasses/hud/health - suit_store = /obj/item/weapon/gun/smg/skorpion - l_pocket = /obj/item/storage/pouch/medical_injectors/medic - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/clf/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - -/datum/outfit/job/clf/medic/uzi - suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness - r_pocket = /obj/item/storage/holster/flarepouch - -/datum/outfit/job/clf/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - -/datum/outfit/job/clf/medic/skorpion - suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness - r_pocket = /obj/item/storage/holster/flarepouch - -/datum/outfit/job/clf/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - -/datum/outfit/job/clf/medic/paladin - suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness - r_pocket = /obj/item/storage/pouch/shotgun - -/datum/outfit/job/clf/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) //CLF Specialist /datum/job/clf/specialist @@ -296,92 +48,6 @@ /datum/outfit/job/clf/specialist/clf_heavymachinegun, ) -//The base loadout for all CLF Specialists -/datum/outfit/job/clf/specialist - name = "CLF Specialist" - jobtype = /datum/job/clf/specialist - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/colonist/webbing - shoes = /obj/item/clothing/shoes/black - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - head = /obj/item/clothing/head/helmet/marine - r_pocket = /obj/item/storage/pouch/pistol - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - - -/datum/outfit/job/clf/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) - -/datum/outfit/job/clf/specialist/dpm - suit_store = /obj/item/weapon/gun/rifle/dpm - -/datum/outfit/job/clf/specialist/dpm/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/clf/specialist/clf_heavyrifle - suit_store = /obj/item/weapon/gun/clf_heavyrifle - back = /obj/item/shotgunbox/clf_heavyrifle - belt = /obj/item/storage/belt/utility/full - -/datum/outfit/job/clf/specialist/clf_heavyrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/clf/specialist/clf_heavymachinegun - suit_store = /obj/item/weapon/gun/icc_hmg - belt = /obj/item/storage/belt/sparepouch - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/clf/specialist/clf_heavymachinegun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) //CLF Leader @@ -398,140 +64,3 @@ /datum/outfit/job/clf/leader/upp_rifle, /datum/outfit/job/clf/leader/lmg_d, ) - -//the base loadout for all clf leaders -/datum/outfit/job/clf/leader - name = "CLF Leader" - jobtype = /datum/job/clf/leader - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/colonist/webbing - shoes = /obj/item/clothing/shoes/black - wear_suit = /obj/item/clothing/suit/storage/faction/militia - gloves = /obj/item/clothing/gloves/black - head = /obj/item/clothing/head/militia - glasses = /obj/item/clothing/glasses/hud/health - r_pocket = /obj/item/storage/pouch/pistol - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/clf/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) - -/datum/outfit/job/clf/leader/assault_rifle - suit_store = /obj/item/weapon/gun/rifle/m16/ugl - -/datum/outfit/job/clf/leader/assault_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/clf/leader/mpi_km - suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier - belt = /obj/item/storage/belt/marine/som - -/datum/outfit/job/clf/leader/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/clf/leader/som_rifle - suit_store = /obj/item/weapon/gun/rifle/som/basic - belt = /obj/item/storage/belt/marine/som - -/datum/outfit/job/clf/leader/som_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) - -/datum/outfit/job/clf/leader/upp_rifle - suit_store = /obj/item/weapon/gun/rifle/type71/flamer/standard - -/datum/outfit/job/clf/leader/upp_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - -/datum/outfit/job/clf/leader/lmg_d - suit_store = /obj/item/weapon/gun/rifle/lmg_d/magharness - belt = /obj/item/storage/belt/marine/som - -/datum/outfit/job/clf/leader/lmg_d/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) diff --git a/code/datums/jobs/job/deathsquad.dm b/code/datums/jobs/job/deathsquad.dm index 149c1b88d49f9..9c3df684b8d90 100644 --- a/code/datums/jobs/job/deathsquad.dm +++ b/code/datums/jobs/job/deathsquad.dm @@ -11,71 +11,6 @@ skills_type = /datum/skills/deathsquad outfit = /datum/outfit/job/deathsquad/standard -/datum/outfit/job/deathsquad/standard - name = "Deathsquad Standard" - jobtype = /datum/job/deathsquad/standard - id = /obj/item/card/id/silver - belt = /obj/item/weapon/gun/energy/lasgun/pulse - ears = /obj/item/radio/headset/distress/commando - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando - shoes = /obj/item/clothing/shoes/marine/deathsquad - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/commando - gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando - head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando - mask = /obj/item/clothing/mask/gas/pmc - glasses = /obj/item/clothing/glasses/night/m42_night_goggles - suit_store = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/deathsquad - r_pocket = /obj/item/storage/pouch/medkit - l_pocket = /obj/item/storage/pouch/grenade - back = /obj/item/storage/backpack/commando - implants = list(/obj/item/implant/suicide_dust) - -/datum/outfit/job/deathsquad/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) //Deathsquad Leader /datum/job/deathsquad/leader @@ -84,69 +19,6 @@ skills_type = /datum/skills/sl/deathsquad outfit = /datum/outfit/job/deathsquad/leader -/datum/outfit/job/deathsquad/leader - name = "Deathsquad Leader" - jobtype = /datum/job/deathsquad/leader - id = /obj/item/card/id/silver - belt = /obj/item/weapon/gun/energy/lasgun/pulse - ears = /obj/item/radio/headset/distress/commando - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando - shoes = /obj/item/clothing/shoes/marine/deathsquad - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/commando - gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando - head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando - mask = /obj/item/clothing/mask/gas/pmc - glasses = /obj/item/clothing/glasses/night/m42_night_goggles - suit_store = /obj/item/weapon/gun/launcher/rocket/m57a4/deathsquad - r_pocket = /obj/item/storage/pouch/medkit - l_pocket = /obj/item/storage/pouch/explosive - back = /obj/item/storage/backpack/commando - implants = list(/obj/item/implant/suicide_dust) - -/datum/outfit/job/deathsquad/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/pinpointer, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) //Deathsquad Gunner /datum/job/deathsquad/gunner @@ -154,67 +26,3 @@ paygrade = "DS" skills_type = /datum/skills/smartgunner/deathsquad outfit = /datum/outfit/job/deathsquad/gunner - -/datum/outfit/job/deathsquad/gunner - name = "Deathsquad Gunner" - jobtype = /datum/job/deathsquad/gunner - id = /obj/item/card/id/silver - belt = /obj/item/weapon/gun/energy/lasgun/pulse - ears = /obj/item/radio/headset/distress/commando - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando - shoes = /obj/item/clothing/shoes/marine/deathsquad - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/commando - gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando - mask = /obj/item/clothing/mask/gas/pmc - head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando - glasses = /obj/item/clothing/glasses/night/m42_night_goggles - suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/deathsquad - r_pocket = /obj/item/storage/pouch/medkit - l_pocket = /obj/item/storage/pouch/magazine/drum - back = /obj/item/storage/backpack/commando - implants = list(/obj/item/implant/suicide_dust) - -/datum/outfit/job/deathsquad/gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - diff --git a/code/datums/jobs/job/erp.dm b/code/datums/jobs/job/erp.dm index d72ea5914fb11..36859cfccb3ca 100644 --- a/code/datums/jobs/job/erp.dm +++ b/code/datums/jobs/job/erp.dm @@ -8,161 +8,20 @@ minimap_icon = "erp" outfit = /datum/outfit/job/erp -/datum/outfit/job/erp - name = "ERP Prankster" - jobtype = /datum/job/erp - - id = /obj/item/card/id/captains_spare - ears = /obj/item/radio/headset/distress/erp - mask = /obj/item/clothing/mask/gas/clown_hat - gloves = /obj/item/clothing/gloves/marine/black - back = /obj/item/storage/backpack/clown - shoes = /obj/item/clothing/shoes/clown_shoes/erp - w_uniform = /obj/item/clothing/under/rank/clown/erp - wear_suit = /obj/item/clothing/suit/modular/rownin/erp - head = /obj/item/clothing/head/tgmcberet/red2/erp - l_pocket = /obj/item/storage/pouch/medkit/firstaid - r_pocket = /obj/item/storage/holster/flarepouch/full - belt = /obj/item/storage/belt/marine - suit_store = /obj/item/weapon/gun/rifle/standard_carbine/beginner - -/datum/outfit/job/erp/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) - /datum/job/erp/masterprankster title = "ERP Master Prankster" skills_type = /datum/skills/prankster/masterprankster outfit = /datum/outfit/job/erp/masterprankster -/datum/outfit/job/erp/masterprankster - name = "ERP Master Prankster" - jobtype = /datum/job/erp/masterprankster - - head = /obj/item/clothing/head/tgmcberet/red2/erp/masterprankster - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle - -/datum/outfit/job/erp/masterprankster/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) /datum/job/erp/boobookisser title = "ERP Boo-boo Kisser" skills_type = /datum/skills/prankster/boobookisser outfit = /datum/outfit/job/erp/boobookisser -/datum/outfit/job/erp/boobookisser - name = "ERP Boo-boo kisser" - jobtype = /datum/job/erp/boobookisser - - l_pocket = /obj/item/storage/pouch/medkit/medic - r_pocket = /obj/item/storage/pouch/medical_injectors/medic - belt = /obj/item/storage/belt/lifesaver/full - -/datum/outfit/job/erp/boobookisser/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) /datum/job/erp/piethrower title = "ERP Pie thrower" skills_type = /datum/skills/prankster/piethrower outfit = /datum/outfit/job/erp/piethrower -/datum/outfit/job/erp/piethrower - name = "ERP Pie thrower" - jobtype = /datum/job/erp/piethrower - - belt = /obj/item/storage/belt/grenade - suit_store = /obj/item/weapon/gun/grenade_launcher/multinade_launcher/erp - r_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/erp/piethrower/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) diff --git a/code/datums/jobs/job/freelancers.dm b/code/datums/jobs/job/freelancers.dm index 0b3d9eb733dad..857e5d8abb621 100644 --- a/code/datums/jobs/job/freelancers.dm +++ b/code/datums/jobs/job/freelancers.dm @@ -7,35 +7,6 @@ minimap_icon = "freelancer" outfit = /datum/outfit/job/freelancer -//What all freelancers have shared in between them -/datum/outfit/job/freelancer - name = "Freelancer" - jobtype = /datum/job/freelancer - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/rebreather/scarf/freelancer - w_uniform = /obj/item/clothing/under/marine/veteran/freelancer - belt = /obj/item/storage/belt/marine - wear_suit = /obj/item/clothing/suit/storage/faction/freelancer - shoes = /obj/item/clothing/shoes/marine - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/frelancer - back = /obj/item/storage/backpack/lightpack - l_pocket = /obj/item/storage/pouch/medkit/firstaid - -/datum/outfit/job/freelancer/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife, SLOT_IN_BOOT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) //Freelancer Standard /datum/job/freelancer/standard @@ -49,93 +20,6 @@ /datum/outfit/job/freelancer/standard/three, ) -/datum/outfit/job/freelancer/standard - name = "Freelancer Standard" - jobtype = /datum/job/freelancer/standard - -/datum/outfit/job/freelancer/standard/post_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) - -/datum/outfit/job/freelancer/standard/one - suit_store = /obj/item/weapon/gun/rifle/m16/freelancer - r_pocket = /obj/item/storage/pouch/shotgun - -/datum/outfit/job/freelancer/standard/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - -///m16 ugl -/datum/outfit/job/freelancer/standard/two - suit_store = /obj/item/weapon/gun/rifle/m16/ugl - r_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/freelancer/standard/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - -///tx11 -/datum/outfit/job/freelancer/standard/three - suit_store = /obj/item/weapon/gun/rifle/tx11/freelancerone - r_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/freelancer/standard/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) //Freelancer Medic /datum/job/freelancer/medic @@ -144,30 +28,6 @@ skills_type = /datum/skills/combat_medic outfit = /datum/outfit/job/freelancer/medic -/datum/outfit/job/freelancer/medic - name = "Freelancer Medic" - jobtype = /datum/job/freelancer/medic - - belt = /obj/item/storage/belt/lifesaver/full - wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/medic - glasses = /obj/item/clothing/glasses/hud/health - suit_store = /obj/item/weapon/gun/rifle/famas/freelancermedic - r_pocket = /obj/item/storage/pouch/medical_injectors/medic - l_pocket = /obj/item/storage/pouch/magazine/large - -/datum/outfit/job/freelancer/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) //Freelancer Veteran. Generic term for 'better equipped dude' /datum/job/freelancer/grenadier @@ -181,92 +41,6 @@ /datum/outfit/job/freelancer/grenadier/three, ) -/datum/outfit/job/freelancer/grenadier - name = "Freelancer Veteran" - jobtype = /datum/job/freelancer/grenadier - -/datum/outfit/job/freelancer/grenadier/one - w_uniform = /obj/item/clothing/under/marine/veteran/freelancer/veteran - suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer - r_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/freelancer/grenadier/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - -///machine gunner -/datum/outfit/job/freelancer/grenadier/two - belt = /obj/item/storage/belt/sparepouch - suit_store = /obj/item/weapon/gun/rifle/m412l1_hpr/freelancer - -/datum/outfit/job/freelancer/grenadier/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - -///actual grenadier -/datum/outfit/job/freelancer/grenadier/three - suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer - r_pocket = /obj/item/storage/pouch/magazine/large - -/datum/outfit/job/freelancer/grenadier/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) //Freelancer Leader /datum/job/freelancer/leader @@ -280,82 +54,3 @@ /datum/outfit/job/freelancer/leader/two, /datum/outfit/job/freelancer/leader/three, ) - -/datum/outfit/job/freelancer/leader - name = "Freelancer Leader" - jobtype = /datum/job/freelancer/leader - -/datum/outfit/job/freelancer/leader - w_uniform = /obj/item/clothing/under/marine/veteran/freelancer/veteran - head = /obj/item/clothing/head/frelancer/beret - glasses = /obj/item/clothing/glasses/hud/health - -/datum/outfit/job/freelancer/leader/post_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - -/datum/outfit/job/freelancer/leader/one - belt = /obj/item/storage/belt/grenade/b17 - wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader - suit_store = /obj/item/weapon/gun/rifle/m16/freelancer - r_pocket = /obj/item/storage/pouch/shotgun - -/datum/outfit/job/freelancer/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - -///tx11 -/datum/outfit/job/freelancer/leader/two - belt = /obj/item/belt_harness/marine - wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader/two - suit_store = /obj/item/weapon/gun/rifle/tx11/freelancertwo - r_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/freelancer/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - -///tx55 -/datum/outfit/job/freelancer/leader/three - wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader/three - suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer - r_pocket = /obj/item/storage/pouch/magazine/large - -/datum/outfit/job/freelancer/leader/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) diff --git a/code/datums/jobs/job/icc.dm b/code/datums/jobs/job/icc.dm index 55f09cb84e5b3..851610a3edd29 100644 --- a/code/datums/jobs/job/icc.dm +++ b/code/datums/jobs/job/icc.dm @@ -19,107 +19,6 @@ /datum/outfit/job/icc/standard/icc_assaultcarbine, ) -/datum/outfit/job/icc - name = "ICC Standard" - jobtype = /datum/job/icc - - id = /obj/item/card/id/silver - w_uniform = /obj/item/clothing/under/icc/webbing - belt = /obj/item/storage/belt/marine/icc - ears = /obj/item/radio/headset/distress/icc - w_uniform = /obj/item/clothing/under/icc/webbing - shoes = /obj/item/clothing/shoes/marine/icc/knife - wear_suit = /obj/item/clothing/suit/storage/marine/icc - gloves = /obj/item/clothing/gloves/marine/icc - head = /obj/item/clothing/head/helmet/marine/icc - mask = /obj/item/clothing/mask/gas/icc - -// Basic standard equipment -/datum/outfit/job/icc/standard - name = "ICC Standard" - jobtype = /datum/job/icc - - id = /obj/item/card/id/silver - gloves = /obj/item/clothing/gloves/marine/icc/insulated - r_pocket = /obj/item/storage/pouch/pistol/icc - l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid - back = /obj/item/storage/backpack/lightpack/icc - - -/datum/outfit/job/icc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/icc_dpistol, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - -/datum/outfit/job/icc/standard/mpi_km - suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard - -/datum/outfit/job/icc/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - -/datum/outfit/job/icc/standard/icc_pdw - suit_store = /obj/item/weapon/gun/smg/icc_pdw/standard - -/datum/outfit/job/icc/standard/icc_pdw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - -/datum/outfit/job/icc/standard/icc_battlecarbine - suit_store = /obj/item/weapon/gun/rifle/icc_battlecarbine/standard - -/datum/outfit/job/icc/standard/icc_battlecarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - -/datum/outfit/job/icc/standard/icc_assaultcarbine - suit_store = /obj/item/weapon/gun/rifle/icc_assaultcarbine - -/datum/outfit/job/icc/standard/icc_assaultcarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) //ICC Guard /datum/job/icc/guard @@ -133,103 +32,6 @@ /datum/outfit/job/icc/guard/icc_bagmg, ) -/datum/outfit/job/icc/guard - name = "ICC Guard" - jobtype = /datum/job/icc/guard - - shoes = /obj/item/clothing/shoes/marine/icc/guard/knife - wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard - gloves = /obj/item/clothing/gloves/marine/icc/guard - head = /obj/item/clothing/head/helmet/marine/icc/guard - - -/datum/outfit/job/icc/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tramadol, SLOT_IN_ACCESSORY) - - -/datum/outfit/job/icc/guard/coilgun - suit_store = /obj/item/weapon/gun/launcher/rocket/icc - back = /obj/item/weapon/gun/rifle/icc_coilgun - l_pocket = /obj/item/storage/pouch/explosive/icc - r_pocket = /obj/item/storage/pouch/explosive/icc - -/datum/outfit/job/icc/guard/coilgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/heat, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/heat, SLOT_IN_L_POUCH) - - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - -/datum/outfit/job/icc/guard/icc_autoshotgun - suit_store = /obj/item/weapon/gun/rifle/icc_coilgun - back = /obj/item/weapon/gun/rifle/icc_autoshotgun/guard - l_pocket = /obj/item/storage/pouch/magazine/large/icc - r_pocket = /obj/item/storage/pouch/magazine/large/icc - -/datum/outfit/job/icc/guard/icc_autoshotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) - -/datum/outfit/job/icc/guard/icc_bagmg - wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard/heavy - head = /obj/item/clothing/head/helmet/marine/icc/guard/heavy - suit_store = /obj/item/weapon/gun/rifle/icc_coilgun - back = /obj/item/storage/holster/icc_mg/full - belt = /obj/item/ammo_magazine/icc_mg/belt - l_pocket = /obj/item/storage/pouch/magazine/large/icc - r_pocket = /obj/item/storage/pouch/magazine/large/icc - -/datum/outfit/job/icc/guard/icc_bagmg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) - //ICC Medic /datum/job/icc/medic @@ -243,71 +45,6 @@ /datum/outfit/job/icc/medic/icc_sharpshooter, ) -/datum/outfit/job/icc/medic - name = "ICC Medic" - jobtype = /datum/job/icc/medic - - id = /obj/item/card/id/silver - gloves = /obj/item/clothing/gloves/marine/icc - back = /obj/item/storage/backpack/lightpack/icc - belt = /obj/item/storage/belt/lifesaver/icc/ert - glasses = /obj/item/clothing/glasses/hud/health - -/datum/outfit/job/icc/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) - -/datum/outfit/job/icc/medic/icc_machinepistol - suit_store = /obj/item/weapon/gun/smg/icc_machinepistol/medic - l_pocket = /obj/item/storage/pouch/magazine/large/icc - r_pocket = /obj/item/storage/pouch/magazine/large/icc - -/datum/outfit/job/icc/medic/icc_machinepistol/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) - -/datum/outfit/job/icc/medic/icc_sharpshooter - suit_store = /obj/item/weapon/gun/rifle/icc_sharpshooter/medic - l_pocket = /obj/item/storage/pouch/magazine/large/icc - r_pocket = /obj/item/storage/pouch/magazine/large/icc - -/datum/outfit/job/icc/medic/icc_sharpshooter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) /datum/job/icc/leader title = "ICC Leader" @@ -319,54 +56,3 @@ /datum/outfit/job/icc/leader/trenchgun, /datum/outfit/job/icc/leader/icc_confrontationrifle, ) - - -/datum/outfit/job/icc/leader - name = "ICC Leader" - jobtype = /datum/job/icc/leader - - shoes = /obj/item/clothing/shoes/marine/icc/knife - wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard - gloves = /obj/item/clothing/gloves/marine/icc/guard - head = /obj/item/clothing/head/helmet/marine/icc/guard - back = /obj/item/storage/backpack/lightpack/icc/guard - l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid - r_pocket = /obj/item/storage/pouch/construction/icc/full - - -/datum/outfit/job/icc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - -/datum/outfit/job/icc/leader/ml101 - suit_store = /obj/item/weapon/gun/shotgun/pump/icc_heavyshotgun/icc_leader - belt = /obj/item/storage/belt/shotgun/icc/mixed - -/datum/outfit/job/icc/leader/icc_confrontationrifle - belt = /obj/item/storage/belt/marine/icc - suit_store = /obj/item/weapon/gun/rifle/icc_confrontationrifle/leader - -/datum/outfit/job/icc/leader/icc_confrontationrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) diff --git a/code/datums/jobs/job/imperium.dm b/code/datums/jobs/job/imperium.dm index 3db4d6786720b..39d296789cee8 100644 --- a/code/datums/jobs/job/imperium.dm +++ b/code/datums/jobs/job/imperium.dm @@ -7,58 +7,12 @@ access = ALL_ANTAGONIST_ACCESS minimal_access = ALL_ANTAGONIST_ACCESS -/datum/outfit/job/imperial - name = "Imperial Standard" - jobtype = /datum/job/imperial - - id = /obj/item/card/id - //belt = - ears = /obj/item/radio/headset/distress/imperial - w_uniform = /obj/item/clothing/under/marine/imperial - shoes = /obj/item/clothing/shoes/marine/imperial - //wear_suit = - gloves = /obj/item/clothing/gloves/marine - //head = - //mask = - //glasses = - //suit_store = - //r_pocket = - //l_pocket = - //back = - -/datum/outfit/job/imperial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.grant_language(/datum/language/imperial) - /datum/job/imperial/guardsman title = "Guardsman" comm_title = "Guard" paygrade = "Guard" outfit = /datum/outfit/job/imperial/guardsman -/datum/outfit/job/imperial/guardsman - name = "Imperial Guardsman" - jobtype = /datum/job/imperial/guardsman - - belt = /obj/item/storage/belt/marine/te_cells - wear_suit = /obj/item/clothing/suit/storage/marine/imperial - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle - head = /obj/item/clothing/head/helmet/marine/imperial - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/holster/flarepouch/full - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/imperial/guardsman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) /datum/job/imperial/guardsman/sergeant title = "Guardsman Sergeant" @@ -67,14 +21,6 @@ paygrade = "Sergeant" outfit = /datum/outfit/job/imperial/guardsman/sergeant -/datum/outfit/job/imperial/guardsman/sergeant - name = "Guardsman Sergeant" - jobtype = /datum/job/imperial/guardsman/sergeant - - wear_suit = /obj/item/clothing/suit/storage/marine/imperial/sergeant - head = /obj/item/clothing/head/helmet/marine/imperial/sergeant - r_pocket = /obj/item/storage/pouch/explosive/upp - l_pocket = /obj/item/storage/pouch/field_pouch/full /datum/job/imperial/guardsman/medicae title = "Guardsman Medicae" @@ -83,26 +29,6 @@ paygrade = "Medicae" outfit = /datum/outfit/job/imperial/guardsman/medicae -/datum/outfit/job/imperial/guardsman/medicae - name = "Guardsman Medicae" - jobtype = /datum/job/imperial/guardsman/medicae - - belt = /obj/item/storage/belt/lifesaver/full - wear_suit = /obj/item/clothing/suit/storage/marine/imperial/medicae - glasses = /obj/item/clothing/glasses/hud/health - l_pocket = /obj/item/storage/pouch/medkit/medic - r_pocket = /obj/item/storage/pouch/medical_injectors/medic - -/datum/outfit/job/imperial/guardsman/medicae/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/zoom, SLOT_IN_BACKPACK) // closest thing to combat performance drugs /datum/job/imperial/commissar title = "Imperial Commissar" @@ -111,25 +37,3 @@ paygrade = "Commissar" outfit = /datum/outfit/job/imperial/commissar -/datum/outfit/job/imperial/commissar - name = "Imperial Commissar" - jobtype = /datum/job/imperial/commissar - - belt = /obj/item/storage/holster/belt/mateba/full //Ideally this can be later replaced with a bolter - w_uniform = /obj/item/clothing/under/marine/imperial/commissar - wear_suit = /obj/item/clothing/suit/storage/marine/imperial/commissar - suit_store = /obj/item/weapon/sword/commissar_sword - gloves = /obj/item/clothing/gloves/marine/commissar - head = /obj/item/clothing/head/commissar - l_pocket = /obj/item/storage/pouch/medkit/firstaid - r_pocket = /obj/item/storage/pouch/magazine/pistol/large/mateba - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/imperial/commissar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm index 0feb2d2e917c7..d4a07eed94916 100644 --- a/code/datums/jobs/job/job.dm +++ b/code/datums/jobs/job/job.dm @@ -173,33 +173,6 @@ GLOBAL_PROTECT(exp_specialmap) if(req_admin_notify) to_chat(M, "You are playing a job that is important for game progression. If you have to disconnect, please head to hypersleep, if you can't make it there, notify the admins via adminhelp.") -/datum/outfit/job - var/jobtype - - -/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - return - - -/datum/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - return - - -/datum/outfit/job/proc/handle_id(mob/living/carbon/human/H) - var/datum/job/job = H.job ? H.job : SSjob.GetJobType(jobtype) - var/obj/item/card/id/id = H.wear_id - if(!istype(id)) - return - id.access = job.get_access() - id.iff_signal = GLOB.faction_to_iff[job.faction] - shuffle_inplace(id.access) // Shuffle access list to make NTNet passkeys less predictable - id.registered_name = H.real_name - id.assignment = job.title - id.rank = job.title - id.paygrade = job.paygrade - id.update_label() - if(H.mind?.initial_account) // In most cases they won't have a mind at this point. - id.associated_account_number = H.mind.initial_account.account_number /datum/job/proc/get_special_name(client/preference_source) return diff --git a/code/datums/jobs/job/marines.dm b/code/datums/jobs/job/marines.dm index 8fdae2c7c6aea..cc3e0fb3714df 100644 --- a/code/datums/jobs/job/marines.dm +++ b/code/datums/jobs/job/marines.dm @@ -83,12 +83,6 @@ Make your way to the cafeteria for some post-cryosleep chow, and then get equipp What you lack alone, you gain standing shoulder to shoulder with the men and women of the TerraGov Marine Corps. Ooh-rah!"}) -/datum/outfit/job/marine/standard - name = SQUAD_MARINE - jobtype = /datum/job/terragov/squad/standard - - id = /obj/item/card/id/dogtag - //Squad Engineer /datum/job/terragov/squad/engineer title = SQUAD_ENGINEER @@ -125,13 +119,6 @@ What you lack alone, you gain standing shoulder to shoulder with the men and wom to_chat(M, {"\nYou have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle."}) - -/datum/outfit/job/marine/engineer - name = SQUAD_ENGINEER - jobtype = /datum/job/terragov/squad/engineer - - id = /obj/item/card/id/dogtag/engineer - /datum/job/terragov/squad/engineer/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE) . = ..() if(!ishuman(new_mob)) @@ -188,11 +175,6 @@ Your squaddies will look to you when it comes to construction in the field of ba to_chat(M, {"\nYou must tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters."}) -/datum/outfit/job/marine/corpsman - name = SQUAD_CORPSMAN - jobtype = /datum/job/terragov/squad/corpsman - - id = /obj/item/card/id/dogtag/corpsman /datum/job/terragov/squad/corpsman/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE) . = ..() @@ -267,11 +249,6 @@ You may not be a fully-fledged doctor, but you stand between life and death when if(60001 to INFINITY) // 1000 hrs new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. -/datum/outfit/job/marine/smartgunner - name = SQUAD_SMARTGUNNER - jobtype = /datum/job/terragov/squad/smartgunner - - id = /obj/item/card/id/dogtag/smartgun //Squad Specialist /datum/job/terragov/squad/specialist @@ -300,12 +277,6 @@ You may not be a fully-fledged doctor, but you stand between life and death when You can serve a variety of roles, so choose carefully."}) -/datum/outfit/job/marine/specialist - name = SQUAD_SPECIALIST - jobtype = /datum/job/terragov/squad/specialist - - id = /obj/item/card/id/dogtag - head = /obj/item/clothing/head/helmet/specrag //Squad Leader /datum/job/terragov/squad/leader @@ -347,12 +318,6 @@ You can serve a variety of roles, so choose carefully."}) to_chat(M, {"\nYou are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way."}) -/datum/outfit/job/marine/leader - name = SQUAD_LEADER - jobtype = /datum/job/terragov/squad/leader - - id = /obj/item/card/id/dogtag/leader - /datum/job/terragov/squad/leader/after_spawn(mob/living/carbon/C, mob/user, latejoin = FALSE) . = ..() if(!ishuman(C)) @@ -399,7 +364,3 @@ You are also in charge of communicating with command and letting them know about /datum/job/terragov/squad/vatgrown/return_spawn_type(datum/preferences/prefs) return /mob/living/carbon/human/species/vatgrown -/datum/outfit/job/marine/vatgrown - name = SQUAD_VATGROWN - jobtype = /datum/job/terragov/squad/vatgrown - id = /obj/item/card/id/dogtag diff --git a/code/datums/jobs/job/mercenaries.dm b/code/datums/jobs/job/mercenaries.dm index a8ae1651752a4..109835d7669bb 100644 --- a/code/datums/jobs/job/mercenaries.dm +++ b/code/datums/jobs/job/mercenaries.dm @@ -12,23 +12,6 @@ paygrade = "MRC1" outfit = /datum/outfit/job/mercenaries/heavy - - -/datum/outfit/job/mercenaries/heavy - name = "Mercenary Heavy" - jobtype = /datum/job/mercenaries/heavy - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/marine/veteran/mercenary - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary - gloves = /obj/item/clothing/gloves/combat - head = /obj/item/clothing/head/helmet/marine/veteran/mercenary - mask = /obj/item/clothing/mask/gas/pmc - back = /obj/item/storage/backpack/satchel/norm - - //Mercenary Miner /datum/job/mercenaries/miner title = "Mercenary Miner" @@ -36,40 +19,9 @@ outfit = /datum/outfit/job/mercenaries/miner -/datum/outfit/job/mercenaries/miner - name = "Mercenary Miner" - jobtype = /datum/job/mercenaries/miner - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/miner - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner - gloves = /obj/item/clothing/gloves/combat - head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner - mask = /obj/item/clothing/mask/gas/pmc - back = /obj/item/storage/backpack/satchel/norm - - //Mercenary Engineer /datum/job/mercenaries/engineer title = "Mercenary Engineer" paygrade = "MRC3" outfit = /datum/outfit/job/mercenaries/engineer - -/datum/outfit/job/mercenaries/engineer - name = "Mercenary Engineer" - jobtype = /datum/job/mercenaries/engineer - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/engineer - belt = /obj/item/storage/belt/utility/full - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/engineer - gloves = /obj/item/clothing/gloves/combat - head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/engineer - glasses = /obj/item/clothing/glasses/welding/flipped - mask = /obj/item/clothing/mask/gas/pmc - back = /obj/item/storage/backpack/satchel/eng diff --git a/code/datums/jobs/job/other.dm b/code/datums/jobs/job/other.dm index 050780946c686..fb8f5afdf3187 100644 --- a/code/datums/jobs/job/other.dm +++ b/code/datums/jobs/job/other.dm @@ -4,18 +4,6 @@ paygrade = "C" outfit = /datum/outfit/job/other/colonist - -/datum/outfit/job/other/colonist - name = "Colonist" - jobtype = /datum/job/colonist - - id = /obj/item/card/id - w_uniform = /obj/item/clothing/under/colonist - shoes = /obj/item/clothing/shoes/marine - l_pocket = /obj/item/storage/pouch/survival/full - r_pocket = /obj/item/radio - - //Passenger /datum/job/passenger title = "Passenger" @@ -29,23 +17,6 @@ minimal_access = ALL_MARINE_ACCESS outfit = /datum/outfit/job/other/pizza - -/datum/outfit/job/other/pizza - name = "Pizza Deliverer" - jobtype = /datum/job/pizza - - id = /obj/item/card/id/silver - w_uniform = /obj/item/clothing/under/pizza - belt = /obj/item/weapon/gun/pistol/holdout - shoes = /obj/item/clothing/shoes/red - gloves = /obj/item/clothing/gloves/black - head = /obj/item/clothing/head/soft/red - r_pocket = /obj/item/radio - l_pocket = /obj/item/reagent_containers/food/drinks/cans/dr_gibb - back = /obj/item/storage/backpack/satchel - r_hand = /obj/item/pizzabox/random - - //Spatial Agent /datum/job/spatial_agent title = "Spatial Agent" @@ -54,51 +25,18 @@ skills_type = /datum/skills/spatial_agent outfit = /datum/outfit/job/other/spatial_agent - -/datum/outfit/job/other/spatial_agent - name = "Spatial Agent" - jobtype = /datum/job/spatial_agent - - id = /obj/item/card/id/silver - w_uniform = /obj/item/clothing/under/rank/centcom_commander/sa - belt = /obj/item/storage/belt/utility/full - shoes = /obj/item/clothing/shoes/marinechief/sa - gloves = /obj/item/clothing/gloves/marine/officer/chief/sa - glasses = /obj/item/clothing/glasses/hud/sa/nodrop - back = /obj/item/storage/backpack/marine/satchel - /datum/job/spatial_agent/galaxy_red outfit = /datum/outfit/job/other/spatial_agent/galaxy_red -/datum/outfit/job/other/spatial_agent/galaxy_red - w_uniform = /obj/item/clothing/under/liaison_suit/galaxy_red - belt = null - back = null - /datum/job/spatial_agent/galaxy_blue outfit = /datum/outfit/job/other/spatial_agent/galaxy_blue -/datum/outfit/job/other/spatial_agent/galaxy_blue - w_uniform = /obj/item/clothing/under/liaison_suit/galaxy_blue - belt = null - back = null - /datum/job/spatial_agent/xeno_suit outfit = /datum/outfit/job/other/spatial_agent/xeno_suit -/datum/outfit/job/other/spatial_agent/xeno_suit - head = /obj/item/clothing/head/xenos - wear_suit = /obj/item/clothing/suit/xenos - /datum/job/spatial_agent/marine_officer outfit = /datum/outfit/job/other/spatial_agent/marine_officer -/datum/outfit/job/other/spatial_agent/marine_officer - w_uniform = /obj/item/clothing/under/marine/officer/bridge - head = /obj/item/clothing/head/beret/marine - belt = /obj/item/storage/holster/belt/pistol/m4a3/officer - back = null - shoes = /obj/item/clothing/shoes/marine/full /datum/job/zombie title = "Oh god run" diff --git a/code/datums/jobs/job/pmc.dm b/code/datums/jobs/job/pmc.dm index 43f4ba7cdca94..78e1d01c13ab6 100644 --- a/code/datums/jobs/job/pmc.dm +++ b/code/datums/jobs/job/pmc.dm @@ -14,61 +14,6 @@ outfit = /datum/outfit/job/pmc/standard -/datum/outfit/job/pmc/standard - name = "PMC Standard" - jobtype = /datum/job/pmc/standard - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/pmc - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/veteran/pmc - mask = /obj/item/clothing/mask/gas/pmc/leader - suit_store = /obj/item/weapon/gun/smg/m25/elite/pmc - r_pocket = /obj/item/storage/pouch/grenade - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/satchel - - -/datum/outfit/job/pmc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - //PMC Gunner /datum/job/pmc/gunner title = "PMC Gunner" @@ -77,57 +22,6 @@ outfit = /datum/outfit/job/pmc/gunner -/datum/outfit/job/pmc/gunner - name = "PMC Gunner" - jobtype = /datum/job/pmc/gunner - - id = /obj/item/card/id/silver - belt = /obj/item/belt_harness/marine - ears = /obj/item/radio/headset/distress/pmc - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/gunner - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner - mask = /obj/item/clothing/mask/gas/pmc - glasses = /obj/item/clothing/glasses/night/m56_goggles - suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc - r_pocket = /obj/item/storage/pouch/explosive - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/pmc/gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/mine/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/mine/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - - //PMC Sniper /datum/job/pmc/sniper title = "PMC Sniper" @@ -136,48 +30,6 @@ outfit = /datum/outfit/job/pmc/sniper -/datum/outfit/job/pmc/sniper - name = "PMC Sniper" - jobtype = /datum/job/pmc/sniper - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70_pmc - ears = /obj/item/radio/headset/distress/pmc - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/webbing - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper - mask = /obj/item/clothing/mask/gas/pmc - glasses = /obj/item/clothing/glasses/night/m42_night_goggles - suit_store = /obj/item/weapon/gun/rifle/sniper/elite - r_pocket = /obj/item/storage/pouch/magazine/large/pmc_sniper - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/satchel - - -/datum/outfit/job/pmc/sniper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - - //PMC Leader /datum/job/pmc/leader job_category = JOB_CAT_COMMAND @@ -185,59 +37,3 @@ paygrade = "PMC4" skills_type = /datum/skills/sl/pmc outfit = /datum/outfit/job/pmc/leader - - -/datum/outfit/job/pmc/leader - name = "PMC Leader" - jobtype = /datum/job/pmc/leader - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/pmc - w_uniform = /obj/item/clothing/under/marine/veteran/pmc/leader/holster - shoes = /obj/item/clothing/shoes/veteran/pmc - wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/leader - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/veteran/pmc/leader - mask = /obj/item/clothing/mask/gas/pmc/leader - glasses = /obj/item/clothing/glasses/night/m42_night_goggles - suit_store = /obj/item/weapon/gun/rifle/m412/elite - r_pocket = /obj/item/storage/pouch/grenade - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/satchel - - -/datum/outfit/job/pmc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78/pmc(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) diff --git a/code/datums/jobs/job/retired.dm b/code/datums/jobs/job/retired.dm index eccc08c278aaa..8caf33760bbc5 100644 --- a/code/datums/jobs/job/retired.dm +++ b/code/datums/jobs/job/retired.dm @@ -8,49 +8,7 @@ faction = FACTION_TERRAGOV outfit = /datum/outfit/job/retired -/datum/outfit/job/retired - name = "TGMC retired veteran" - jobtype = /datum/job/retired - id = /obj/item/card/id/dogtag - wear_suit = /obj/item/clothing/suit/storage/marine/officer/req //it's pas - glasses = /obj/item/clothing/glasses/eyepatch - w_uniform = /obj/item/clothing/under/marine/service - mask = /obj/item/clothing/mask/cigarette/pipe - head = /obj/item/clothing/head/servicecap - back = /obj/item/storage/backpack/satchel - belt = /obj/item/storage/belt/marine - gloves = /obj/item/clothing/gloves/marine/black - l_pocket = /obj/item/storage/pouch/medkit/firstaid - r_pocket = /obj/item/storage/holster/flarepouch/full - suit_store = /obj/item/weapon/gun/rifle/m41a/magharness - ears = /obj/item/radio/headset/distress/retired - shoes = /obj/item/clothing/shoes/marine/brown/full - -/datum/outfit/job/retired/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) - - var/list/limbs = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - for(var/i in 1 to 2) - var/datum/limb/picked_limb = H.get_limb(pick_n_take(limbs)) - picked_limb.robotize() /datum/job/retired/leader title = "TGMC retired veteran expedition leader" @@ -58,24 +16,3 @@ skills_type = /datum/skills/veteran_captain //The leader gets even more skills outfit = /datum/outfit/job/retired/leader -/datum/outfit/job/retired/leader - name = "TGMC retired veteran expedition leader" - jobtype = /datum/job/retired/leader - - id = /obj/item/card/id/dogtag/fc - head = /obj/item/clothing/head/tgmcberet/fc - gloves = /obj/item/clothing/gloves/marine/officer - w_uniform = /obj/item/clothing/under/marine/officer/exec - belt = /obj/item/storage/holster/blade/officer/full - suit_store = /obj/item/storage/holster/belt/mateba/full - back = /obj/item/ammo_magazine/minigun_wheelchair - shoes = null - -/datum/outfit/job/retired/leader/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) - - H.amputate_limb(BODY_ZONE_L_LEG) - H.amputate_limb(BODY_ZONE_R_LEG) - var/obj/vehicle/ridden/wheelchair/weaponized/wheelchair = new(H.drop_location()) - wheelchair.buckle_mob(H, TRUE) diff --git a/code/datums/jobs/job/sectoid.dm b/code/datums/jobs/job/sectoid.dm index d94bdf53acf1a..b5bdefe2ca560 100644 --- a/code/datums/jobs/job/sectoid.dm +++ b/code/datums/jobs/job/sectoid.dm @@ -6,46 +6,6 @@ faction = FACTION_SECTOIDS outfit = /datum/outfit/job/sectoid -/datum/outfit/job/sectoid - name = "Sectoid Grunt" - jobtype = /datum/job/sectoid - - id = /obj/item/card/id - belt = /obj/item/storage/belt/marine/sectoid - head = /obj/item/clothing/head/helmet/sectoid - ears = /obj/item/radio/headset/distress/sectoid - w_uniform = /obj/item/clothing/under/sectoid - glasses = /obj/item/clothing/glasses/night/sectoid - shoes = /obj/item/clothing/shoes/sectoid - wear_suit = /obj/item/clothing/suit/armor/sectoid - gloves = /obj/item/clothing/gloves/sectoid - r_pocket = /obj/item/stack/medical/heal_pack/gauze/sectoid - l_pocket = /obj/item/explosive/grenade/sectoid - back = /obj/item/weapon/gun/rifle/sectoid_rifle - - var/list/abilities = list( - /datum/action/ability/activable/sectoid/mindmeld, - /datum/action/ability/activable/sectoid/mindfray, - ) - -/datum/outfit/job/sectoid/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.set_species("Sectoid") - - H.name = GLOB.namepool[/datum/namepool/sectoid].random_name(H) - H.real_name = H.name - - for(var/ability in abilities) - H.add_ability(ability) - -/datum/outfit/job/sectoid/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BELT) //Sectoid Grunt /datum/job/sectoid/grunt @@ -56,30 +16,9 @@ title = "Sectoid psionic" outfit = /datum/outfit/job/sectoid/psionic -/datum/outfit/job/sectoid/psionic - abilities = list( - /datum/action/ability/activable/sectoid/mindmeld, - /datum/action/ability/activable/sectoid/mindfray, - /datum/action/ability/activable/sectoid/reknit_form, - /datum/action/ability/activable/sectoid/stasis, - ) //Sectoid Leader /datum/job/sectoid/leader job_category = JOB_CAT_COMMAND title = "Sectoid Leader" outfit = /datum/outfit/job/sectoid/leader - -/datum/outfit/job/sectoid/leader - name = "Sectoid Leader" - jobtype = /datum/job/sectoid/leader - wear_suit = /obj/item/clothing/suit/armor/sectoid/shield - abilities = list( - /datum/action/ability/activable/sectoid/mindmeld/greater, - /datum/action/ability/activable/sectoid/mindfray, - /datum/action/ability/activable/sectoid/reknit_form/greater, - /datum/action/ability/activable/sectoid/stasis, - /datum/action/ability/activable/sectoid/fuse, - /datum/action/ability/activable/psionic_interact, - /datum/action/ability/activable/sectoid/reanimate, - ) diff --git a/code/datums/jobs/job/shipside.dm b/code/datums/jobs/job/shipside.dm index 48b1246a3f925..d831203ee0fb5 100644 --- a/code/datums/jobs/job/shipside.dm +++ b/code/datums/jobs/job/shipside.dm @@ -76,36 +76,6 @@ Godspeed, captain! And remember, you are not above the law."}) outfit = /datum/outfit/job/command/captain_campaign multiple_outfits = FALSE -/datum/outfit/job/command/captain - name = CAPTAIN - jobtype = /datum/job/terragov/command/captain - - id = /obj/item/card/id/gold - belt = /obj/item/storage/holster/belt/pistol/smart_pistol/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/command - shoes = /obj/item/clothing/shoes/marinechief/captain - gloves = /obj/item/clothing/gloves/marine/techofficer/captain - head = /obj/item/clothing/head/beret/marine/captain - r_pocket = /obj/item/storage/pouch/general/large/command - l_pocket = /obj/item/hud_tablet/leadership - back = /obj/item/storage/backpack/marine/satchel/captain_cloak - -/datum/outfit/job/command/captain/robot - species = SPECIES_COMBAT_ROBOT - - w_uniform = /obj/item/clothing/under/marine/robotic - shoes = null - gloves = null - head = /obj/item/clothing/head/modular/robot - r_pocket = /obj/item/storage/pouch/general/large/command - l_pocket = /obj/item/hud_tablet/leadership - -/datum/outfit/job/command/captain_campaign - name = CAPTAIN - jobtype = /datum/job/terragov/command/captain - - id = /obj/item/card/id/gold //Field Commander /datum/job/terragov/command/fieldcommander @@ -171,44 +141,11 @@ Make the TGMC proud!"}) new_human.wear_id.paygrade = "M10" //If you play way too much TGMC. 1000 hours. -/datum/outfit/job/command/fieldcommander - name = FIELD_COMMANDER - jobtype = /datum/job/terragov/command/fieldcommander - - id = /obj/item/card/id/dogtag/fc - belt = /obj/item/storage/holster/blade/officer/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/exec - wear_suit = /obj/item/clothing/suit/modular/xenonauten - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine/officer - head = /obj/item/clothing/head/tgmcberet/fc - r_pocket = /obj/item/storage/pouch/general/large/command - l_pocket = /obj/item/hud_tablet/fieldcommand - suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander - -/datum/outfit/job/command/fieldcommander/robot - species = SPECIES_COMBAT_ROBOT - - w_uniform = /obj/item/clothing/under/marine/robotic - wear_suit = /obj/item/clothing/suit/modular/robot - shoes = null - gloves = null - head = /obj/item/clothing/head/modular/robot - r_pocket = /obj/item/storage/pouch/general/large/command - l_pocket = /obj/item/hud_tablet/fieldcommand - suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander - //Campaign version with specific loadout /datum/job/terragov/command/fieldcommander/campaign outfit = /datum/outfit/job/command/fieldcommander_campaign multiple_outfits = FALSE -/datum/outfit/job/command/fieldcommander_campaign - name = FIELD_COMMANDER - jobtype = /datum/job/terragov/command/fieldcommander/campaign - - id = /obj/item/card/id/dogtag/fc //Staff Officer /datum/job/terragov/command/staffofficer @@ -274,35 +211,6 @@ You are in charge of logistics and the overwatch system. You are also in line to outfit = /datum/outfit/job/command/staffofficer_campaign multiple_outfits = FALSE -/datum/outfit/job/command/staffofficer - name = STAFF_OFFICER - jobtype = /datum/job/terragov/command/staffofficer - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/pistol/m4a3/officer - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/bridge - shoes = /obj/item/clothing/shoes/marine/full - head = /obj/item/clothing/head/tgmccap/ro - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/binoculars/tactical - - -/datum/outfit/job/command/staffofficer/robot - species = SPECIES_COMBAT_ROBOT - - w_uniform = /obj/item/clothing/under/marine/robotic - shoes = null - gloves = null - head = /obj/item/clothing/head/modular/robot - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/binoculars/tactical - -/datum/outfit/job/command/staffofficer_campaign - name = STAFF_OFFICER - jobtype = /datum/job/terragov/command/staffofficer - - id = /obj/item/card/id/silver //Transport Officer /datum/job/terragov/command/transportofficer @@ -357,30 +265,6 @@ You are in charge of logistics and the overwatch system. You are also in line to You are to ensure the Tadpole's survival and to transport marines around, acting as a mobile bunker. In the case of it's death, you may perform the role of Combat Engineer. "}) -/datum/outfit/job/command/transportofficer - name = TRANSPORT_OFFICER - jobtype = /datum/job/terragov/command/transportofficer - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/utility/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/pilot - wear_suit = /obj/item/clothing/suit/storage/marine/pilot - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine/insulated - glasses = /obj/item/clothing/glasses/welding/superior - head = /obj/item/clothing/head/helmet/marine/pilot - r_pocket = /obj/item/storage/pouch/construction - l_pocket = /obj/item/hud_tablet/transportofficer - back = /obj/item/storage/backpack/marine/engineerpack - suit_store = /obj/item/storage/holster/belt/pistol/m4a3/vp70 - -/datum/outfit/job/command/transportofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) //Pilot Officer /datum/job/terragov/command/pilot @@ -439,22 +323,6 @@ Though you are an officer, your authority is limited to the dropship and the Con "}) -/datum/outfit/job/command/pilot - name = PILOT_OFFICER - jobtype = /datum/job/terragov/command/pilot - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70 - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/pilot - wear_suit = /obj/item/clothing/suit/storage/marine/pilot - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine/insulated - glasses = /obj/item/clothing/glasses/sunglasses/aviator - head = /obj/item/clothing/head/helmet/marine/pilot - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/hud_tablet/pilot - //Mech pilot /datum/job/terragov/command/mech_pilot title = MECH_PILOT @@ -509,22 +377,7 @@ You can serve your Division in a variety of roles, so choose carefully."}) if(60001 to INFINITY) // 1000 hrs new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. -/datum/outfit/job/command/mech_pilot - name = MECH_PILOT - jobtype = /datum/job/terragov/command/mech_pilot - - id = /obj/item/card/id/dogtag - belt = /obj/item/storage/belt/utility/full - glasses = /obj/item/clothing/glasses/welding - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/mech - wear_suit = /obj/item/clothing/suit/storage/marine/mech_pilot - head = /obj/item/clothing/head/helmet/marine/mech_pilot - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine -/datum/outfit/job/command/mech_pilot/fallen - ears = null #define ASSAULT_CREWMAN_POPLOCK 50 //tank/arty driver+gunner @@ -587,20 +440,6 @@ You can serve your Division in a variety of roles, so choose carefully."}) if(60001 to INFINITY) // 1000 hrs new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. -/datum/outfit/job/command/assault_crewman - name = ASSAULT_CREWMAN - jobtype = /datum/job/terragov/command/assault_crewman - - id = /obj/item/card/id/dogtag - belt = /obj/item/storage/belt/utility/full - glasses = /obj/item/clothing/glasses/welding - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/assault_crewman - wear_suit = /obj/item/clothing/suit/storage/marine/assault_crewman - head = /obj/item/clothing/head/helmet/marine/assault_crewman - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine - l_pocket = /obj/item/pamphlet/tank_loader //apc/jeep driver /datum/job/terragov/command/transport_crewman @@ -654,19 +493,7 @@ You can serve your Division in a variety of roles, so choose carefully."}) if(60001 to INFINITY) // 1000 hrs new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. -/datum/outfit/job/command/transport_crewman - name = TRANSPORT_CREWMAN - jobtype = /datum/job/terragov/command/transport_crewman - id = /obj/item/card/id/dogtag - belt = /obj/item/storage/belt/utility/full - glasses = /obj/item/clothing/glasses/welding - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/transport_crewman - wear_suit = /obj/item/clothing/suit/storage/marine/transport_crewman - head = /obj/item/clothing/head/helmet/marine/transport_crewman - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine /datum/job/terragov/engineering job_category = JOB_CAT_ENGINEERING @@ -732,29 +559,6 @@ If you have no idea how to set up the engine, or it's your first time, mentor You are also next in the chain of command, should the bridge crew fall in the line of duty."}) -/datum/outfit/job/engineering/chief - name = CHIEF_SHIP_ENGINEER - jobtype = /datum/job/terragov/engineering/chief - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/utility/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/ce - wear_suit = /obj/item/clothing/suit/storage/marine/officer/req - shoes = /obj/item/clothing/shoes/marine/full - glasses = /obj/item/clothing/glasses/welding/superior - gloves = /obj/item/clothing/gloves/insulated - head = /obj/item/clothing/head/beret/marine/techofficer - r_pocket = /obj/item/storage/pouch/construction - back = /obj/item/storage/backpack/marine/engineerpack - -/datum/outfit/job/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) - //Ship Engineer /datum/job/terragov/engineering/tech title = SHIP_TECH @@ -809,22 +613,6 @@ You are also next in the chain of command, should the bridge crew fall in the li requisitions line and later on to be ready to send supplies for marines who are groundside."}) -/datum/outfit/job/engineering/tech - name = SHIP_TECH - jobtype = /datum/job/terragov/engineering/tech - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/utility/full - ears = /obj/item/radio/headset/mainship/st - w_uniform = /obj/item/clothing/under/marine/officer/engi - wear_suit = /obj/item/clothing/suit/storage/marine/ship_tech - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/insulated - glasses = /obj/item/clothing/glasses/welding/flipped - head = /obj/item/clothing/head/tgmccap/req - r_pocket = /obj/item/storage/pouch/general/medium - back = /obj/item/storage/backpack/marine/engineerpack - /datum/job/terragov/requisitions job_category = JOB_CAT_REQUISITIONS selection_color = "#BAAFD9" @@ -891,24 +679,6 @@ While you may request paperwork for supplies, do not go out of your way to screw A happy ship is a well-functioning ship."}) -/datum/outfit/job/requisitions/officer - name = REQUISITIONS_OFFICER - jobtype = /datum/job/terragov/requisitions/officer - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/m44/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/ro_suit - wear_suit = /obj/item/clothing/suit/storage/marine/officer/req - suit_store = /obj/item/weapon/gun/energy/taser - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/insulated - head = /obj/item/clothing/head/tgmccap/req - r_pocket = /obj/item/storage/pouch/general/large - -/datum/outfit/job/requisitions/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/supplytablet, SLOT_IN_R_POUCH) /datum/job/terragov/medical job_category = JOB_CAT_MEDICAL @@ -979,35 +749,6 @@ Make sure that the doctors and nurses are doing their jobs and keeping the marin if(18001 to INFINITY) // 300 hrs new_human.wear_id.paygrade = "CMO" -/datum/outfit/job/medical/professor - name = CHIEF_MEDICAL_OFFICER - jobtype = /datum/job/terragov/medical/professor - - id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/rank/medical/blue - wear_suit = /obj/item/clothing/suit/storage/labcoat/cmo - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical - head = /obj/item/clothing/head/cmo - r_pocket = /obj/item/storage/pouch/surgery - l_pocket = /obj/item/storage/pouch/medkit/doctor - - -/datum/outfit/job/medical/professor/robot - species = SPECIES_COMBAT_ROBOT - - w_uniform = /obj/item/clothing/under/marine/robotic - shoes = null - gloves = null - -/datum/outfit/job/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) //Medical Officer /datum/job/terragov/medical/medicalofficer @@ -1069,38 +810,6 @@ You are tasked with keeping the marines healthy and strong, usually in the form You are also an expert when it comes to medication and treatment. If you do not know what you are doing, mentorhelp so a mentor can assist you."}) -/datum/outfit/job/medical/medicalofficer - name = MEDICAL_DOCTOR - jobtype = /datum/job/terragov/medical/medicalofficer - - id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical - ears = /obj/item/radio/headset/mainship/doc - w_uniform = /obj/item/clothing/under/rank/medical/purple - wear_suit = /obj/item/clothing/suit/storage/labcoat - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical - head = /obj/item/clothing/head/surgery/purple - r_pocket = /obj/item/storage/pouch/surgery - l_pocket = /obj/item/storage/pouch/medkit/doctor - - -/datum/outfit/job/medical/medicalofficer/robot - species = SPECIES_COMBAT_ROBOT - jobtype = /datum/job/terragov/medical/medicalofficer - - w_uniform = /obj/item/clothing/under/marine/robotic - shoes = null - gloves = null - -/datum/outfit/job/medical/medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) - - //Researcher /datum/job/terragov/medical/researcher title = MEDICAL_RESEARCHER @@ -1164,34 +873,6 @@ It is also recommended that you gear up like a regular marine, or your 'internsh new_human.wear_id.paygrade = "PROF" -/datum/outfit/job/medical/researcher - name = MEDICAL_RESEARCHER - jobtype = /datum/job/terragov/medical/researcher - - id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/research - ears = /obj/item/radio/headset/mainship/res - w_uniform = /obj/item/clothing/under/marine/officer/researcher - wear_suit = /obj/item/clothing/suit/storage/labcoat/researcher - shoes = /obj/item/clothing/shoes/laceup - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical - r_pocket = /obj/item/storage/pouch/surgery - l_pocket = /obj/item/storage/pouch/medkit/doctor - - -/datum/outfit/job/medical/researcher/robot - species = SPECIES_COMBAT_ROBOT - - w_uniform = /obj/item/clothing/under/marine/robotic - shoes = null - gloves = null - -/datum/outfit/job/medical/researcher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) /datum/job/terragov/civilian job_category = JOB_CAT_CIVILIAN @@ -1254,15 +935,6 @@ You are not required to follow military orders; however, you cannot give militar Your primary job is to observe and report back your findings to Nanotrasen. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back (especially if the game staff is absent or otherwise busy), and this is normal."}) -/datum/outfit/job/civilian/liaison - name = CORPORATE_LIAISON - jobtype = /datum/job/terragov/civilian/liaison - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/liaison_suit - shoes = /obj/item/clothing/shoes/laceup - /datum/job/terragov/silicon job_category = JOB_CAT_SILICON @@ -1339,20 +1011,6 @@ Use your office fax machine to communicate with corporate headquarters or to acq In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship."}) -/datum/outfit/job/civilian/synthetic - name = SYNTHETIC - jobtype = /datum/job/terragov/silicon/synthetic - - id = /obj/item/card/id/gold - belt = /obj/item/storage/belt/utility/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/rank/synthetic - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/insulated - r_pocket = /obj/item/storage/pouch/general/medium - l_pocket = /obj/item/storage/pouch/general/medium - - /datum/job/terragov/silicon/ai title = SILICON_AI job_category = JOB_CAT_SILICON diff --git a/code/datums/jobs/job/skeleton.dm b/code/datums/jobs/job/skeleton.dm index 7b23352c931fc..ecf20c65c50c5 100644 --- a/code/datums/jobs/job/skeleton.dm +++ b/code/datums/jobs/job/skeleton.dm @@ -4,58 +4,14 @@ skills_type = /datum/skills/skeleton faction = FACTION_NEUTRAL -/datum/outfit/job/skeleton/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.set_species("Skeleton") - - H.name = GLOB.namepool[/datum/namepool/skeleton].random_name(H) - H.real_name = H.name - //Skeleton Man /datum/job/skeleton/basic title = "Skeleton Man" // SKELETON MAAAAAAAAAAAN outfit = /datum/outfit/job/skeleton/basic -/datum/outfit/job/skeleton/basic - name = "Skeleton Man" - jobtype = /datum/job/skeleton/basic - - id = /obj/item/card/id - w_uniform = /obj/item/clothing/under/gladiator - shoes = /obj/item/clothing/shoes/sandal - head = /obj/item/clothing/head/helmet/gladiator - belt = /obj/item/weapon/sword - back = /obj/item/weapon/twohanded/spear - ears = /obj/item/radio/headset/survivor - r_pocket = /obj/item/flashlight - l_pocket = /obj/item/tool/crowbar/red - -/datum/outfit/job/skeleton/basic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/milk, SLOT_L_HAND) - //Skeleton Chief /datum/job/skeleton/leader title = "Skeleton Commander" outfit = /datum/outfit/job/skeleton/leader - -/datum/outfit/job/skeleton/leader - name = "Skeleton Commander" - jobtype = /datum/job/skeleton/leader - - id = /obj/item/card/id - w_uniform = /obj/item/clothing/under/gladiator - shoes = /obj/item/clothing/shoes/sandal - head = /obj/item/clothing/head/helmet/gladiator - belt = /obj/item/weapon/sword - back = /obj/item/weapon/twohanded/glaive - ears = /obj/item/radio/headset/survivor - r_pocket = /obj/item/flashlight - l_pocket = /obj/item/reagent_containers/food/drinks/milk - -/datum/outfit/job/skeleton/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/milk, SLOT_L_HAND) diff --git a/code/datums/jobs/job/sons_of_mars_ert.dm b/code/datums/jobs/job/sons_of_mars_ert.dm index 0fc546327a48c..40057772f655f 100644 --- a/code/datums/jobs/job/sons_of_mars_ert.dm +++ b/code/datums/jobs/job/sons_of_mars_ert.dm @@ -4,8 +4,6 @@ minimal_access = ALL_ANTAGONIST_ACCESS skills_type = /datum/skills/crafty -/datum/outfit/job/som/ert - id = /obj/item/card/id/dogtag/som //SOM Standard /datum/job/som/ert/standard @@ -20,138 +18,6 @@ /datum/outfit/job/som/ert/standard/charger, ) -//Base SOM standard outfit -/datum/outfit/job/som/ert/standard - name = "SOM Marine" - jobtype = /datum/job/som/ert/standard - - ears = /obj/item/radio/headset/distress/som - w_uniform = /obj/item/clothing/under/som/webbing - shoes = /obj/item/clothing/shoes/marine/som/knife - wear_suit = /obj/item/clothing/suit/modular/som - gloves = /obj/item/clothing/gloves/marine/som - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/modular/som - r_pocket = /obj/item/storage/pouch/firstaid/som/full - l_pocket = /obj/item/storage/pouch/grenade/som/ert - back = /obj/item/storage/backpack/lightpack/som - -/datum/outfit/job/som/ert/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) - -/datum/outfit/job/som/ert/standard/standard_assaultrifle - suit_store = /obj/item/weapon/gun/rifle/som/mag_harness - belt = /obj/item/storage/belt/marine/som/som_rifle - -/datum/outfit/job/som/ert/standard/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/standard/standard_smg - suit_store = /obj/item/weapon/gun/smg/som/support - belt = /obj/item/storage/belt/marine/som/som_smg - -/datum/outfit/job/som/ert/standard/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/standard/standard_shotgun - back = /obj/item/storage/backpack/satchel/som - belt = /obj/item/storage/belt/shotgun/som/mixed - wear_suit = /obj/item/clothing/suit/modular/som/light/shield - suit_store = /obj/item/weapon/gun/shotgun/som/standard - -/datum/outfit/job/som/ert/standard/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/standard/charger - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/magharness - belt = /obj/item/storage/belt/marine/som/volkite - -/datum/outfit/job/som/ert/standard/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) //SOM Medic /datum/job/som/ert/medic @@ -166,106 +32,6 @@ /datum/outfit/job/som/ert/medic/standard_shotgun, ) -//Base SOM medic outfit -/datum/outfit/job/som/ert/medic - name = "SOM Medic" - jobtype = /datum/job/som/ert/medic - - belt = /obj/item/storage/belt/lifesaver/som/quick - ears = /obj/item/radio/headset/distress/som - w_uniform = /obj/item/clothing/under/som/medic/vest - shoes = /obj/item/clothing/shoes/marine/som/knife - wear_suit = /obj/item/clothing/suit/modular/som - gloves = /obj/item/clothing/gloves/marine/som - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/modular/som - glasses = /obj/item/clothing/glasses/hud/health - r_pocket = /obj/item/storage/pouch/magazine/large/som - l_pocket = /obj/item/storage/pouch/grenade/som/ert - back = /obj/item/storage/backpack/lightpack/som - -/datum/outfit/job/som/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/medic/standard_assaultrifle - suit_store = /obj/item/weapon/gun/rifle/som/mag_harness - -/datum/outfit/job/som/ert/medic/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - -/datum/outfit/job/som/ert/medic/standard_smg - suit_store = /obj/item/weapon/gun/smg/som/support - -/datum/outfit/job/som/ert/medic/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - -/datum/outfit/job/som/ert/medic/standard_shotgun - r_pocket = /obj/item/storage/pouch/shotgun/som - suit_store = /obj/item/weapon/gun/shotgun/som/support - -/datum/outfit/job/som/ert/medic/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) //SOM Veteran /datum/job/som/ert/veteran @@ -283,226 +49,6 @@ /datum/outfit/job/som/ert/veteran/culverin, ) -//Base SOM veteran outfit -/datum/outfit/job/som/ert/veteran - name = "SOM Veteran" - jobtype = /datum/job/som/ert/veteran - - belt = /obj/item/storage/belt/marine/som/volkite - ears = /obj/item/radio/headset/distress/som - w_uniform = /obj/item/clothing/under/som/veteran/webbing - shoes = /obj/item/clothing/shoes/marine/som/knife - wear_suit = /obj/item/clothing/suit/modular/som/heavy - gloves = /obj/item/clothing/gloves/marine/som/veteran - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/modular/som/veteran - glasses = /obj/item/clothing/glasses/meson - r_pocket = /obj/item/storage/pouch/firstaid/som/full - l_pocket = /obj/item/storage/pouch/grenade/som/ert - back = /obj/item/storage/backpack/lightpack/som - -/datum/outfit/job/som/ert/veteran/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - -/datum/outfit/job/som/ert/veteran/charger - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet - -/datum/outfit/job/som/ert/veteran/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/veteran/breacher_vet - head = /obj/item/clothing/head/modular/som/lorica - glasses = /obj/item/clothing/glasses/welding - wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet - l_hand = /obj/item/weapon/shield/riot/marine/som - -/datum/outfit/job/som/ert/veteran/breacher_vet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/veteran/caliver - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet - -/datum/outfit/job/som/ert/veteran/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/veteran/caliver_pack - belt = /obj/item/storage/belt/grenade/som - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet - l_pocket = /obj/item/storage/pouch/pistol/som - back = /obj/item/cell/lasgun/volkite/powerpack - -/datum/outfit/job/som/ert/veteran/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_L_POUCH) - -/datum/outfit/job/som/ert/veteran/culverin - belt = /obj/item/weapon/gun/shotgun/double/sawn - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness - back = /obj/item/cell/lasgun/volkite/powerpack - -/datum/outfit/job/som/ert/veteran/culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/veteran/rpg - head = /obj/item/clothing/head/modular/som/bio - wear_suit = /obj/item/clothing/suit/modular/som/heavy/mithridatius - suit_store = /obj/item/weapon/gun/smg/som/support - belt = /obj/item/storage/belt/marine/som - back = /obj/item/storage/holster/backholster/rpg/som/ert - l_pocket = /obj/item/storage/pouch/grenade/som - -/datum/outfit/job/som/ert/veteran/rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/veteran/pyro - head = /obj/item/clothing/head/modular/som/hades - wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro - belt = /obj/item/storage/holster/belt/pistol/m4a3/som - back = /obj/item/ammo_magazine/flamer_tank/backtank - suit_store = /obj/item/weapon/gun/flamer/som/mag_harness - -/datum/outfit/job/som/ert/veteran/pyro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_SUIT) - -/datum/outfit/job/som/ert/veteran/shotgunner - belt = /obj/item/storage/belt/shotgun/som/flechette - wear_suit = /obj/item/clothing/suit/modular/som/light/shield - suit_store = /obj/item/weapon/gun/shotgun/som/burst/ert - -/datum/outfit/job/som/ert/veteran/shotgunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) //SOM Specialist - special weapon vets /datum/job/som/ert/specialist @@ -534,118 +80,6 @@ /datum/outfit/job/som/ert/leader/caliver_pack, ) -//Base SOM leader outfit -/datum/outfit/job/som/ert/leader - name = "SOM Leader" - jobtype = /datum/job/som/ert/leader - - belt = /obj/item/storage/belt/marine/som/volkite - ears = /obj/item/radio/headset/distress/som - w_uniform = /obj/item/clothing/under/som/leader/webbing - shoes = /obj/item/clothing/shoes/marine/som/knife - wear_suit = /obj/item/clothing/suit/modular/som/heavy/leader/valk - gloves = /obj/item/clothing/gloves/marine/som/veteran - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/modular/som/leader - glasses = /obj/item/clothing/glasses/hud/health - r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader - l_pocket = /obj/item/storage/pouch/grenade/som/ert - back = /obj/item/storage/backpack/lightpack/som - -/datum/outfit/job/som/ert/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) - -/datum/outfit/job/som/ert/leader/standard_assaultrifle - suit_store = /obj/item/weapon/gun/rifle/som/veteran - belt = /obj/item/storage/belt/marine/som/som_rifle_ap - -/datum/outfit/job/som/ert/leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/leader/charger - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet - -/datum/outfit/job/som/ert/leader/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/leader/caliver - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet - -/datum/outfit/job/som/ert/leader/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/leader/caliver_pack - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor - belt = /obj/item/belt_harness - back = /obj/item/cell/lasgun/volkite/powerpack - -/datum/outfit/job/som/ert/leader/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - //Breacher ERT @@ -662,43 +96,6 @@ /datum/outfit/job/som/ert/veteran/breacher_vet, ) -/datum/outfit/job/som/ert/veteran/breacher_melee - head = /obj/item/clothing/head/modular/som/lorica - wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica - suit_store = /obj/item/weapon/twohanded/fireaxe/som - belt = /obj/item/storage/holster/belt/pistol/m4a3/som - -/datum/outfit/job/som/ert/veteran/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) /datum/job/som/ert/breacher/specialist title = "SOM Breacher Specialist" @@ -710,70 +107,6 @@ /datum/outfit/job/som/ert/veteran/breacher_culverin, ) -/datum/outfit/job/som/ert/veteran/breacher_rpg - head = /obj/item/clothing/head/modular/som/lorica - wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica - suit_store = /obj/item/weapon/twohanded/fireaxe/som - belt = /obj/item/storage/belt/grenade/som - back = /obj/item/storage/holster/backholster/rpg/som/ert - l_pocket = /obj/item/storage/pouch/explosive/som - -/datum/outfit/job/som/ert/veteran/breacher_rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/heat, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/rad, SLOT_IN_L_POUCH) - -/datum/outfit/job/som/ert/veteran/breacher_flamer - head = /obj/item/clothing/head/modular/som/hades - wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro - suit_store = /obj/item/weapon/twohanded/fireaxe/som - belt = /obj/item/storage/belt/sparepouch/som - back = /obj/item/weapon/gun/flamer/som/mag_harness - -/datum/outfit/job/som/ert/veteran/breacher_flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/veteran/breacher_culverin - head = /obj/item/clothing/head/modular/som/lorica - wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica - belt = /obj/item/weapon/gun/shotgun/double/sawn - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness - back = /obj/item/cell/lasgun/volkite/powerpack - -/datum/outfit/job/som/ert/veteran/breacher_culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) //breacher medic /datum/job/som/ert/medic/breacher @@ -784,33 +117,6 @@ outfit = /datum/outfit/job/som/ert/medic/breacher multiple_outfits = FALSE -/datum/outfit/job/som/ert/medic/breacher - head = /obj/item/clothing/head/modular/som/lorica - wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet - l_hand = /obj/item/weapon/shield/riot/marine/som - -/datum/outfit/job/som/ert/medic/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) //SOM Leader /datum/job/som/ert/leader/breacher @@ -822,59 +128,3 @@ /datum/outfit/job/som/ert/leader/breacher_ranged, ) -/datum/outfit/job/som/ert/leader/breacher_melee - suit_store = /obj/item/weapon/twohanded/fireaxe/som - belt = /obj/item/storage/holster/belt/pistol/m4a3/som - -/datum/outfit/job/som/ert/leader/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - -/datum/outfit/job/som/ert/leader/breacher_ranged - suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet - l_hand = /obj/item/weapon/shield/riot/marine/som - -/datum/outfit/job/som/ert/leader/breacher_ranged/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new/obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) diff --git a/code/datums/jobs/job/sons_of_mars_shipside.dm b/code/datums/jobs/job/sons_of_mars_shipside.dm index 95121edfbd31b..4624525d6cbff 100644 --- a/code/datums/jobs/job/sons_of_mars_shipside.dm +++ b/code/datums/jobs/job/sons_of_mars_shipside.dm @@ -44,15 +44,6 @@ If you require any help, use mentorhelp to ask mentors about what you're Godspeed, commander! And remember, you are not above the law."}) -/datum/outfit/job/som/command/commander - name = SOM_COMMANDER - jobtype = /datum/job/som/command/commander - - id = /obj/item/card/id/gold - -/datum/outfit/job/som/command/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_R_POUCH) /datum/job/som/command/commander/after_spawn(mob/living/new_mob, mob/user, latejoin) . = ..() @@ -124,11 +115,6 @@ Make the SOM proud!"}) if(30001 to INFINITY) // 500 hrs new_human.wear_id.paygrade = "SOM_O7" -/datum/outfit/job/som/command/fieldcommander - name = SOM_FIELD_COMMANDER - jobtype = /datum/job/som/command/fieldcommander - - id = /obj/item/card/id/dogtag/fc //Staff Officer /datum/job/som/command/staffofficer @@ -179,11 +165,6 @@ You are in charge of logistics and the overwatch system. You are also in line to if(30001 to INFINITY) // 500 hrs new_human.wear_id.paygrade = "SOM_O4" -/datum/outfit/job/som/command/staffofficer - name = SOM_STAFF_OFFICER - jobtype = /datum/job/som/command/staffofficer - - id = /obj/item/card/id/silver //Pilot Officer /datum/job/som/command/pilot @@ -235,21 +216,6 @@ Though you are a warrant officer, your authority is limited to the dropship and "}) -/datum/outfit/job/som/command/pilot - name = SOM_PILOT_OFFICER - jobtype = /datum/job/som/command/pilot - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70 - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/pilot - wear_suit = /obj/item/clothing/suit/storage/marine/pilot - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/insulated - glasses = /obj/item/clothing/glasses/sunglasses/aviator - head = /obj/item/clothing/head/helmet/marine/pilot - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/hud_tablet/pilot //Mech pilot /datum/job/som/command/mech_pilot @@ -301,19 +267,6 @@ You can serve your Division in a variety of roles, so choose carefully."}) if(30001 to INFINITY) // 500 hrs new_human.wear_id.paygrade = "SOM_W5" -/datum/outfit/job/som/command/mech_pilot - name = SOM_MECH_PILOT - jobtype = /datum/job/som/command/mech_pilot - - id = /obj/item/card/id/dogtag - belt = /obj/item/storage/belt/utility/full - glasses = /obj/item/clothing/glasses/welding - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/mech - wear_suit = /obj/item/clothing/suit/storage/marine/mech_pilot - head = /obj/item/clothing/head/helmet/marine/mech_pilot - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine /datum/job/som/engineering job_category = JOB_CAT_ENGINEERING @@ -373,28 +326,6 @@ If you have no idea how to set up the engine, or it's your first time, mentor You are also next in the chain of command, should the bridge crew fall in the line of duty."}) -/datum/outfit/job/som/engineering/chief - name = SOM_CHIEF_ENGINEER - jobtype = /datum/job/som/engineering/chief - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/utility/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/ce - wear_suit = /obj/item/clothing/suit/storage/marine/officer/req - shoes = /obj/item/clothing/shoes/marine/full - glasses = /obj/item/clothing/glasses/welding/superior - gloves = /obj/item/clothing/gloves/insulated - head = /obj/item/clothing/head/beret/marine/techofficer - r_pocket = /obj/item/storage/pouch/construction - back = /obj/item/storage/backpack/marine/engineerpack - -/datum/outfit/job/som/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) //Ship Engineer /datum/job/som/engineering/tech @@ -444,21 +375,6 @@ You are also next in the chain of command, should the bridge crew fall in the li requisitions line and later on to be ready to send supplies for marines who are groundside."}) -/datum/outfit/job/som/engineering/tech - name = SOM_TECH - jobtype = /datum/job/som/engineering/tech - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/utility/full - ears = /obj/item/radio/headset/mainship/st - w_uniform = /obj/item/clothing/under/marine/officer/engi - wear_suit = /obj/item/clothing/suit/storage/marine/ship_tech - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/insulated - glasses = /obj/item/clothing/glasses/welding/flipped - head = /obj/item/clothing/head/tgmccap/req - r_pocket = /obj/item/storage/pouch/general/medium - back = /obj/item/storage/backpack/marine/engineerpack /datum/job/som/requisitions job_category = JOB_CAT_REQUISITIONS @@ -519,20 +435,6 @@ While you may request paperwork for supplies, do not go out of your way to screw A happy base is a well-functioning base."}) -/datum/outfit/job/som/requisitions/officer - name = SOM_REQUISITIONS_OFFICER - jobtype = /datum/job/som/requisitions/officer - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/m44/full - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/marine/officer/ro_suit - wear_suit = /obj/item/clothing/suit/storage/marine/officer/req - suit_store = /obj/item/weapon/gun/energy/taser - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/insulated - head = /obj/item/clothing/head/tgmccap/req - r_pocket = /obj/item/storage/pouch/general/large /datum/job/som/medical job_category = JOB_CAT_MEDICAL @@ -585,27 +487,6 @@ Make sure that the doctors and nurses are doing their jobs and keeping the SOM h if(3001 to INFINITY) // 50 hrs new_human.wear_id.paygrade = "CMO" -/datum/outfit/job/som/medical/professor - name = SOM_CHIEF_MEDICAL_OFFICER - jobtype = /datum/job/som/medical/professor - - id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical - ears = /obj/item/radio/headset/mainship/mcom - w_uniform = /obj/item/clothing/under/rank/medical/blue - wear_suit = /obj/item/clothing/suit/storage/labcoat/cmo - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical - head = /obj/item/clothing/head/cmo - r_pocket = /obj/item/storage/pouch/medkit/doctor - l_pocket = /obj/item/storage/pouch/surgery - -/datum/outfit/job/som/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) //Medical Officer /datum/job/som/medical/medicalofficer @@ -650,25 +531,6 @@ You are tasked with keeping the SOM healthy and strong, usually in the form of s You are also an expert when it comes to medication and treatment. If you do not know what you are doing, mentorhelp so a mentor can assist you."}) -/datum/outfit/job/som/medical/medicalofficer - name = SOM_MEDICAL_DOCTOR - jobtype = /datum/job/som/medical/medicalofficer - - id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical - ears = /obj/item/radio/headset/mainship/doc - w_uniform = /obj/item/clothing/under/rank/medical/purple - wear_suit = /obj/item/clothing/suit/storage/labcoat - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical - head = /obj/item/clothing/head/surgery/purple - -/datum/outfit/job/som/medical/medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) /datum/job/som/civilian @@ -712,24 +574,3 @@ You are also an expert when it comes to medication and treatment. If you do not to_chat(M, {"You are a chef stationed behind the frontlines. You are tasked with keeping the SOM well fed and happy, usually in the form of delicious food. You are also an expert when it comes to botany and hydroponics. If you do not know what you are doing, mentorhelp so a mentor can assist you."}) - - -/datum/outfit/job/som/civilian/chef - name = SOM_CHEF - jobtype = /datum/job/som/civilian/chef - - id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical - ears = /obj/item/radio/headset/mainship/doc - w_uniform = /obj/item/clothing/under/rank/medical/purple - wear_suit = /obj/item/clothing/suit/storage/labcoat - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical - head = /obj/item/clothing/head/surgery/purple - -/datum/outfit/job/som/civilian/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) diff --git a/code/datums/jobs/job/sonsofmars.dm b/code/datums/jobs/job/sonsofmars.dm index 0c42d4e267ac1..19cde45401ebe 100644 --- a/code/datums/jobs/job/sonsofmars.dm +++ b/code/datums/jobs/job/sonsofmars.dm @@ -4,13 +4,6 @@ minimal_access = ALL_ANTAGONIST_ACCESS faction = FACTION_SOM - -/datum/outfit/job/som/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.underwear = 10 - H.undershirt = H.undershirt ? 10 : 0 - H.regenerate_icons() - //Base job for normal gameplay SOM, not ERT. /datum/job/som/squad access = ALL_ANTAGONIST_ACCESS @@ -98,12 +91,6 @@ Make your way to the cafeteria for some post-cryosleep chow, and then get equipp to_chat(M, {"\nYou are a rank-and-file soldier of the Sons of Mars, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the SOM. For Mars!"}) -/datum/outfit/job/som/squad/standard - name = "SOM Standard" - jobtype = /datum/job/som/squad/standard - - id = /obj/item/card/id/dogtag/som - /datum/job/som/squad/engineer title = SOM_SQUAD_ENGINEER @@ -154,11 +141,6 @@ What you lack alone, you gain standing shoulder to shoulder with the men and wom to_chat(M, {"\nYou have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle."}) -/datum/outfit/job/som/squad/engineer - name = "SOM Engineer" - jobtype = /datum/job/som/squad/engineer - - id = /obj/item/card/id/dogtag/som /datum/job/som/squad/medic @@ -210,12 +192,6 @@ Your squaddies will look to you when it comes to construction in the field of ba to_chat(M, {"\nYou must tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters."}) -/datum/outfit/job/som/squad/medic - name = "SOM Medic" - jobtype = /datum/job/som/squad/medic - - id = /obj/item/card/id/dogtag/som - /datum/job/som/squad/veteran title = SOM_SQUAD_VETERAN @@ -262,10 +238,6 @@ You may not be a fully-fledged doctor, but you stand between life and death when . = ..() to_chat(M, {"\nYou are the a Veteran among the SOM. With your long experience (and better training and equipment), your job is to provide special weapons support to bolster the line."}) -/datum/outfit/job/som/squad/veteran - name = "SOM Veteran" - jobtype = /datum/job/som/squad/veteran - id = /obj/item/card/id/dogtag/som /datum/job/som/squad/leader title = SOM_SQUAD_LEADER @@ -326,8 +298,3 @@ You may not be a fully-fledged doctor, but you stand between life and death when to_chat(M, {"\nYou are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way."}) -/datum/outfit/job/som/squad/leader - name = "SOM Leader" - jobtype = /datum/job/som/squad/leader - - id = /obj/item/card/id/dogtag/som diff --git a/code/datums/jobs/job/special_forces.dm b/code/datums/jobs/job/special_forces.dm index 1c9c5a268cc3a..44927bc00188a 100644 --- a/code/datums/jobs/job/special_forces.dm +++ b/code/datums/jobs/job/special_forces.dm @@ -11,274 +11,25 @@ outfit = /datum/outfit/job/special_forces/standard -/datum/outfit/job/special_forces/standard - name = "Special Response Force Standard" - jobtype = /datum/job/special_forces/standard - - glasses = /obj/item/clothing/glasses/night - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/specops - w_uniform = /obj/item/clothing/under/marine/specops - shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/storage/marine/specops - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/modular/m10x - suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed - r_pocket = /obj/item/storage/pouch/grenade - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/special_forces/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - //Special Force breacher /datum/job/special_forces/breacher title = "Special Response Force Breacher" outfit = /datum/outfit/job/special_forces/breacher -/datum/outfit/job/special_forces/breacher - name = "Special Response Force Breacher" - jobtype = /datum/job/special_forces/breacher - - glasses = /obj/item/clothing/glasses/night - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/specops - w_uniform = /obj/item/clothing/under/marine/specops - shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/storage/marine/specops/support - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/modular/m10x - suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed/breacher - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/medkit/firstaid - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/special_forces/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/metal, SLOT_R_HAND) /datum/job/special_forces/drone_operator title = "Special Response Force Drone Operator" outfit = /datum/outfit/job/special_forces/drone_operator -/datum/outfit/job/special_forces/drone_operator - name = "Special Response Force Drone Operator" - jobtype = /datum/job/special_forces/drone_operator - - glasses = /obj/item/clothing/glasses/night - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/specops - w_uniform = /obj/item/clothing/under/marine/specops - shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/storage/marine/specops/support - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/modular/m10x/welding - suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed - r_pocket = /obj/item/storage/pouch/grenade - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/special_forces/drone_operator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/box11x35mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/box11x35mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/uav_turret, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/deployable_vehicle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/unmanned_vehicle_remote, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) //Special forces Medic /datum/job/special_forces/medic title = "Special Response Force Medic" outfit = /datum/outfit/job/special_forces/medic skills_type = /datum/skills/combat_medic/special_forces -/datum/outfit/job/special_forces/medic - name = "Special Response Force Medic" - jobtype = /datum/job/special_forces/medic - - glasses = /obj/item/clothing/glasses/night - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/dutch - w_uniform = /obj/item/clothing/under/marine/specops - belt = /obj/item/storage/belt/lifesaver/full - wear_suit = /obj/item/clothing/suit/storage/marine/specops/medic - head = /obj/item/clothing/head/modular/m10x - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - glasses = /obj/item/clothing/glasses/hud/health - suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed - r_pocket = /obj/item/storage/pouch/medical_injectors/medic - l_pocket = /obj/item/storage/pouch/magazine/large - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/special_forces/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) //Special forces Leader /datum/job/special_forces/leader title = "Special Response Force Leader" skills_type = /datum/skills/sl/pmc/special_forces outfit = /datum/outfit/job/special_forces/leader - - -/datum/outfit/job/special_forces/leader - name = "Special Response Force Leader" - jobtype = /datum/job/special_forces/leader - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine - ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/specops - w_uniform = /obj/item/clothing/under/marine/specops - glasses = /obj/item/clothing/glasses/night - shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/storage/marine/specops/leader - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/beret/sec - suit_store = /obj/item/weapon/gun/rifle/m16/spec_op - r_pocket = /obj/item/storage/pouch/shotgun - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - - -/datum/outfit/job/special_forces/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator/civi, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/incendiary, SLOT_IN_R_POUCH) diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm index ed472b51b4c79..7d5ba4a276471 100644 --- a/code/datums/jobs/job/survivor.dm +++ b/code/datums/jobs/job/survivor.dm @@ -60,28 +60,6 @@ Depending on the job you've undertook, you may have additional skills to help ot Good luck, but do not expect to survive."}) -//Assistant -/datum/job/survivor/assistant - title = "Assistant Survivor" - outfit = /datum/outfit/job/survivor/assistant - - -/datum/outfit/job/survivor/assistant - name = "Assistant Survivor" - jobtype = /datum/job/survivor/assistant - - w_uniform = /obj/item/clothing/under/color/grey - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/norm - wear_suit = /obj/item/clothing/suit/armor/vest - ears = /obj/item/radio/survivor - mask = /obj/item/clothing/mask/gas/tactical/coif - head = /obj/item/clothing/head/welding/flipped - belt = /obj/item/storage/belt/utility/full - l_pocket = /obj/item/flashlight/combat - r_hand = /obj/item/weapon/combat_knife - - //Scientist /datum/job/survivor/scientist title = "Scientist Survivor" @@ -89,29 +67,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/scientist -/datum/outfit/job/survivor/scientist - name = "Scientist Survivor" - jobtype = /datum/job/survivor/scientist - - w_uniform = /obj/item/clothing/under/rank/scientist - wear_suit = /obj/item/clothing/suit/storage/labcoat/researcher - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/toxins - ears = /obj/item/radio/survivor - l_hand = /obj/item/storage/firstaid/adv - l_pocket = /obj/item/storage/pouch/surgery - r_pocket = /obj/item/flashlight/combat - -/datum/outfit/job/survivor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/polyhexanide, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - //Doctor /datum/job/survivor/doctor title = "Doctor's Assistant Survivor" @@ -119,64 +74,12 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/doctor -/datum/outfit/job/survivor/doctor - name = "Doctor's Assistant Survivor" - jobtype = /datum/job/survivor/doctor - - w_uniform = /obj/item/clothing/under/rank/medical/blue - wear_suit = /obj/item/clothing/suit/storage/labcoat - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/med - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - r_pocket = /obj/item/storage/pouch/surgery - belt = /obj/item/storage/belt/rig - mask = /obj/item/clothing/mask/surgical - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/doctor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/bicaridine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/kelotane, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/tramadol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/tricordrazine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/dylovene, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/isotonic, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/inaprovaline, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_R_POUCH) - - //Liaison /datum/job/survivor/liaison title = "Liaison Survivor" outfit = /datum/outfit/job/survivor/liaison -/datum/outfit/job/survivor/liaison - name = "Liaison Survivor" - jobtype = /datum/job/survivor/liaison - - w_uniform = /obj/item/clothing/under/liaison_suit - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/norm - ears = /obj/item/radio/survivor - belt = /obj/item/storage/holster/belt/pistol/m4a3/vp78 - l_hand = /obj/item/flashlight/combat - l_pocket = /obj/item/tool/crowbar - //Security Guard /datum/job/survivor/security title = "Security Guard Survivor" @@ -184,30 +87,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/security -/datum/outfit/job/survivor/security - name = "Security Guard Survivor" - jobtype = /datum/job/survivor/security - - w_uniform = /obj/item/clothing/under/rank/security - wear_suit = /obj/item/clothing/suit/armor/patrol - head = /obj/item/clothing/head/securitycap - shoes = /obj/item/clothing/shoes/marine - back = /obj/item/storage/backpack/security - belt = /obj/item/storage/belt/security - gloves = /obj/item/clothing/gloves/black - suit_store = /obj/item/weapon/gun/pistol/g22 - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/flashlight/combat, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - //Civilian /datum/job/survivor/civilian @@ -215,22 +94,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/civilian -/datum/outfit/job/survivor/civilian - name = "Civilian Survivor" - jobtype = /datum/job/survivor/civilian - - w_uniform = /obj/item/clothing/under/colonist - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/norm - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/civilian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BACKPACK) - - //Chef /datum/job/survivor/chef title = "Chef Survivor" @@ -238,59 +101,12 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/chef -/datum/outfit/job/survivor/chef - name = "Chef Survivor" - jobtype = /datum/job/survivor/chef - - w_uniform = /obj/item/clothing/under/rank/chef - wear_suit = /obj/item/clothing/suit/storage/chef - head = /obj/item/clothing/head/chefhat - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/crazy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/soup/mysterysoup, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/packaged_hdogs, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/organ, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/chocolateegg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/meat/xeno, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/pastries/xemeatpie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/pastries/birthdaycakeslice, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/donut/meat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - - //Botanist /datum/job/survivor/botanist title = "Botanist Survivor" outfit = /datum/outfit/job/survivor/botanist -/datum/outfit/job/survivor/botanist - name = "Botanist Survivor" - jobtype = /datum/job/survivor/botanist - - w_uniform = /obj/item/clothing/under/rank/hydroponics - wear_suit = /obj/item/clothing/suit/storage/apron/overalls - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/hydroponics - ears = /obj/item/radio/survivor - suit_store = /obj/item/weapon/combat_knife - l_pocket = /obj/item/flashlight - r_pocket = /obj/item/tool/crowbar - -/datum/outfit/job/survivor/botanist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, SLOT_IN_BACKPACK) - //Atmospherics Technician /datum/job/survivor/atmos @@ -299,38 +115,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/atmos -/datum/outfit/job/survivor/atmos - name = "Atmospherics Technician Survivor" - jobtype = /datum/job/survivor/atmos - - w_uniform = /obj/item/clothing/under/rank/atmospheric_technician - wear_suit = /obj/item/clothing/suit/storage/hazardvest - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/som - gloves = /obj/item/clothing/gloves/insulated - belt = /obj/item/storage/belt - head = /obj/item/clothing/head/hardhat/white - glasses = /obj/item/clothing/glasses/welding - r_pocket = /obj/item/storage/pouch/electronics/full - l_pocket = /obj/item/storage/pouch/construction - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/multitool, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/lightreplacer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/deployable_floodlight, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_L_POUCH) - //Chaplain /datum/job/survivor/chaplain @@ -338,26 +122,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/chaplain -/datum/outfit/job/survivor/chaplain - name = "Chaplain Survivor" - jobtype = /datum/job/survivor/chaplain - - w_uniform = /obj/item/clothing/under/rank/chaplain - wear_suit = /obj/item/clothing/suit/armor/vest - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/norm - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/bible, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - - //Miner /datum/job/survivor/miner title = "Miner Survivor" @@ -365,26 +129,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/miner -/datum/outfit/job/survivor/miner - name = "Miner Survivor" - jobtype = /datum/job/survivor/miner - - w_uniform = /obj/item/clothing/under/rank/miner - head = /obj/item/clothing/head/helmet/space/rig/mining - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel/som - l_hand = /obj/item/weapon/twohanded/sledgehammer - r_pocket = /obj/item/reagent_containers/cup/glass/flask - r_hand = /obj/item/clothing/suit/space/rig/mining - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/miner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/whiskey, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - //Salesman /datum/job/survivor/salesman @@ -392,27 +136,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/salesman -/datum/outfit/job/survivor/salesman - name = "Salesman Survivor" - jobtype = /datum/job/survivor/salesman - - w_uniform = /obj/item/clothing/under/lawyer/purpsuit - wear_suit = /obj/item/clothing/suit/storage/lawyer/purpjacket - shoes = /obj/item/clothing/shoes/black - back = /obj/item/storage/backpack/satchel - mask = /obj/item/clothing/mask/cigarette/pipe/bonepipe - glasses = /obj/item/clothing/glasses/sunglasses/aviator - ears = /obj/item/radio/survivor - -/datum/outfit/job/survivor/salesman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - //Colonial Marshal /datum/job/survivor/marshal @@ -421,27 +144,6 @@ Good luck, but do not expect to survive."}) outfit = /datum/outfit/job/survivor/marshal -/datum/outfit/job/survivor/marshal - name = "Colonial Marshal Survivor" - jobtype = /datum/job/survivor/marshal - - w_uniform = /obj/item/clothing/under/CM_uniform - wear_suit = /obj/item/clothing/suit/storage/CMB - shoes = /obj/item/clothing/shoes/jackboots - back = /obj/item/storage/backpack/satchel/sec - suit_store = /obj/item/storage/holster/belt/m44/full - belt = /obj/item/storage/belt/sparepouch - gloves = /obj/item/clothing/gloves/ruggedgloves - l_pocket = /obj/item/flashlight/combat - ears = /obj/item/radio/survivor - head = /obj/item/clothing/head/slouch - -/datum/outfit/job/survivor/marshal/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/restraints/handcuffs, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BELT) - // Rambo Survivor - pretty overpowered, pls spawn with caution /datum/job/survivor/rambo @@ -449,19 +151,3 @@ Good luck, but do not expect to survive."}) skills_type = /datum/skills/civilian/survivor/master outfit = /datum/outfit/job/survivor/rambo job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN - -/datum/outfit/job/survivor/rambo - name = "Overpowered Survivor" - jobtype = /datum/job/survivor/rambo - w_uniform = /obj/item/clothing/under/marine/striped - wear_suit = /obj/item/clothing/suit/armor/patrol - shoes = /obj/item/clothing/shoes/marine/clf/full - back = /obj/item/storage/holster/blade/machete/full - gloves = /obj/item/clothing/gloves/ruggedgloves - suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer - belt = /obj/item/storage/belt/marine/alf_machinecarbine - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - r_pocket = /obj/item/flashlight/combat - glasses = /obj/item/clothing/glasses/m42_goggles - head = /obj/item/clothing/head/headband - ears = /obj/item/radio/survivor diff --git a/code/datums/jobs/job/upp.dm b/code/datums/jobs/job/upp.dm index ac068a7c95572..0f85af512dcf1 100644 --- a/code/datums/jobs/job/upp.dm +++ b/code/datums/jobs/job/upp.dm @@ -15,60 +15,6 @@ outfit = /datum/outfit/job/upp/standard/hvh -/datum/outfit/job/upp/standard - name = "USL Gunner" - jobtype = /datum/job/upp/standard - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine/upp/full - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/UPP - mask = /obj/item/clothing/mask/gas/pmc/leader - suit_store = /obj/item/weapon/gun/rifle/type71 - r_pocket = /obj/item/storage/pouch/pistol - l_pocket = /obj/item/storage/pouch/magazine/pistol/large - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/upp/standard/hvh - name = "USL Gunner (HvH)" - - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/hvh - - -/datum/outfit/job/upp/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tramadol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/c99, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - //SL Surgeon /datum/job/upp/medic @@ -81,57 +27,6 @@ outfit = /datum/outfit/job/upp/medic/hvh -/datum/outfit/job/upp/medic - name = "USL Surgeon" - jobtype = /datum/job/upp/medic - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/lifesaver/full/upp - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP/medic - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/uppcap - glasses = /obj/item/clothing/glasses/hud/health - suit_store = /obj/item/weapon/gun/smg/skorpion - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/general/large - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/upp/medic/hvh - name = "USL Surgeon (HvH)" - - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/hvh - - -/datum/outfit/job/upp/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - //USL Powder Monkey /datum/job/upp/heavy @@ -144,54 +39,6 @@ outfit = /datum/outfit/job/upp/heavy/hvh -/datum/outfit/job/upp/heavy - name = "USL Powder Monkey" - jobtype = /datum/job/upp/heavy - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine/upp/full - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/UPP/heavy - suit_store = /obj/item/weapon/gun/rifle/type71/flamer - r_pocket = /obj/item/storage/pouch/explosive - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/upp/heavy/hvh - name = "USL Powder Monkey (HvH)" - - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh - - -/datum/outfit/job/upp/heavy/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - - //USL Captain /datum/job/upp/leader job_category = JOB_CAT_COMMAND @@ -202,48 +49,3 @@ /datum/job/upp/leader/hvh outfit = /datum/outfit/job/upp/leader/hvh - -/datum/outfit/job/upp/leader - name = "USL Captain" - jobtype = /datum/job/upp/leader - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/korovin/standard - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/uppcap/beret - suit_store = /obj/item/weapon/gun/rifle/type71 - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/upp/leader/hvh - name = "USL Captain (HvH)" - - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh - - -/datum/outfit/job/upp/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) diff --git a/code/datums/jobs/job/upp_commando.dm b/code/datums/jobs/job/upp_commando.dm index 5ade4e827028e..04908e99885eb 100644 --- a/code/datums/jobs/job/upp_commando.dm +++ b/code/datums/jobs/job/upp_commando.dm @@ -13,51 +13,6 @@ outfit = /datum/outfit/job/upp/commando/standard -/datum/outfit/job/upp/commando/standard - name = "USL Elite Powder Monkey" - jobtype = /datum/job/upp/commando/standard - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/marine/upp/full - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/commando - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/uppcap - mask = /obj/item/clothing/mask/gas/pmc/upp - glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp - suit_store = /obj/item/weapon/gun/rifle/type71/commando - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - implants = list(/obj/item/implant/suicide_dust) - - -/datum/outfit/job/upp/commando/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/restraints/handcuffs, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/chloralhydrate, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/sleeptoxin, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - //USL Elite Surgeon /datum/job/upp/commando/medic @@ -66,57 +21,6 @@ skills_type = /datum/skills/commando/medic outfit = /datum/outfit/job/upp/commando/medic - -/datum/outfit/job/upp/commando/medic - name = "USL Elite Surgeon" - jobtype = /datum/job/upp/commando/medic - - id = /obj/item/card/id/silver - belt = /obj/item/storage/belt/lifesaver/full/upp - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP/medic - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/commando - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/uppcap - mask = /obj/item/clothing/mask/gas/pmc/upp - glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp - suit_store = /obj/item/weapon/gun/smg/skorpion - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/general/large - back = /obj/item/storage/backpack/lightpack - implants = list(/obj/item/implant/suicide_dust) - - -/datum/outfit/job/upp/commando/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/attachable/suppressor, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/attachable/reddot, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - - //USL Elite Captain /datum/job/upp/commando/leader job_category = JOB_CAT_COMMAND @@ -125,47 +29,3 @@ skills_type = /datum/skills/commando/leader outfit = /datum/outfit/job/upp/commando/leader - -/datum/outfit/job/upp/commando/leader - name = "USL Elite Captain" - jobtype = /datum/job/upp/commando/leader - - id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/korovin/tranq - ears = /obj/item/radio/headset/distress/usl - w_uniform = /obj/item/clothing/under/marine/veteran/UPP - shoes = /obj/item/clothing/shoes/marine - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/commando - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/uppcap/beret - mask = /obj/item/clothing/mask/gas/pmc/upp - glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp - suit_store = /obj/item/weapon/gun/rifle/type71/commando - r_pocket = /obj/item/storage/pouch/general/large - l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack - implants = list(/obj/item/implant/suicide_dust) - - -/datum/outfit/job/upp/commando/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) diff --git a/code/datums/jobs/job/vsd.dm b/code/datums/jobs/job/vsd.dm index 3d54417742448..dad5b140059b4 100644 --- a/code/datums/jobs/job/vsd.dm +++ b/code/datums/jobs/job/vsd.dm @@ -18,126 +18,6 @@ /datum/outfit/job/vsd/standard/grunt_third, ) -//outfits -/datum/outfit/job/vsd/standard - name = "VSD Standard" - jobtype = /datum/job/vsd/standard - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - glasses = /obj/item/clothing/glasses/night/vsd - w_uniform = /obj/item/clothing/under/vsd/webbing - shoes = /obj/item/clothing/shoes/marine/vsd - wear_suit = /obj/item/clothing/suit/storage/marine/vsd - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/vsd - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/magazine - back = /obj/item/storage/backpack/lightpack/vsd - belt = /obj/item/storage/holster/belt/pistol/standard_pistol - -/datum/outfit/job/vsd/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) - -/datum/outfit/job/vsd/standard/grunt_one - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert - head = /obj/item/clothing/head/helmet/marine/vsd/secondary - suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard - mask = /obj/item/clothing/mask/gas/vsd - -/datum/outfit/job/vsd/standard/grunt_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) - -/datum/outfit/job/vsd/standard/ksg - w_uniform = /obj/item/clothing/under/vsd/shirt/webbing - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert - suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/standard - l_pocket = /obj/item/storage/pouch/shotgun - -/datum/outfit/job/vsd/standard/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - -/datum/outfit/job/vsd/standard/grunt_second - suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard - head = /obj/item/clothing/head/vsd - -/datum/outfit/job/vsd/standard/grunt_second/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - -/datum/outfit/job/vsd/standard/grunt_third - suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard - -/datum/outfit/job/vsd/standard/grunt_third/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - //VSD Engineer /datum/job/vsd/engineer title = "VSD Engineer" @@ -150,81 +30,6 @@ /datum/outfit/job/vsd/engineer/vsd_rifle, ) -//outfits -/datum/outfit/job/vsd/engineer - name = "VSD Engineer" - jobtype = /datum/job/vsd/engineer - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - glasses = /obj/item/clothing/glasses/meson - w_uniform = /obj/item/clothing/under/vsd/webbing - shoes = /obj/item/clothing/shoes/marine/vsd - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/desert - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/vsd/secondary - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/magazine - back = /obj/item/storage/backpack/lightpack/vsd - belt = /obj/item/storage/belt/utility/full - -/datum/outfit/job/vsd/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - -/datum/outfit/job/vsd/engineer/l26 - suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/engineer - -/datum/outfit/job/vsd/engineer/l26/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/attachable/buildasentry, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_ACCESSORY) - -/datum/outfit/job/vsd/engineer/vsd_rifle - suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor - head = /obj/item/clothing/head/vsd - -/datum/outfit/job/vsd/engineer/vsd_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_ACCESSORY) - //VSD Medic /datum/job/vsd/medic title = "VSD Medic" @@ -238,107 +43,6 @@ /datum/outfit/job/vsd/medic/vsd_pdw, ) -//outfits -/datum/outfit/job/vsd/medic - name = "VSD Medic" - jobtype = /datum/job/vsd/medic - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - belt = /obj/item/storage/belt/lifesaver/full/upp - glasses = /obj/item/clothing/glasses/hud/health - w_uniform = /obj/item/clothing/under/vsd/medic - shoes = /obj/item/clothing/shoes/marine/vsd - wear_suit = /obj/item/clothing/suit/storage/marine/vsd - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/vsd/medic - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/magazine - back = /obj/item/storage/backpack/lightpack/vsd - -/datum/outfit/job/vsd/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) - -/datum/outfit/job/vsd/medic/ksg - suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/support - l_pocket = /obj/item/storage/pouch/shotgun - -/datum/outfit/job/vsd/medic/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_SUIT) - - -/datum/outfit/job/vsd/medic/vsd_rifle - suit_store = /obj/item/weapon/gun/rifle/vsd_rifle - -/datum/outfit/job/vsd/medic/vsd_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) - -/datum/outfit/job/vsd/medic/vsd_pdw - suit_store = /obj/item/weapon/gun/smg/vsd_pdw/medic - -/datum/outfit/job/vsd/medic/vsd_pdw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_SUIT) - - //VSD Spec /datum/job/vsd/spec title = "VSD Specialist" @@ -354,197 +58,6 @@ /datum/outfit/job/vsd/spec/uslspec_two, ) -//outfits -/datum/outfit/job/vsd/spec - name = "VSD Specialist" - jobtype = /datum/job/vsd/spec - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - glasses = /obj/item/clothing/glasses/night/vsd - w_uniform = /obj/item/clothing/under/vsd/webbing - shoes = /obj/item/clothing/shoes/marine/vsd - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - back = /obj/item/storage/backpack/lightpack/vsd - belt = /obj/item/storage/holster/belt/pistol/standard_pistol - -/datum/outfit/job/vsd/spec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - -/datum/outfit/job/vsd/spec/flamer - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor - head = /obj/item/clothing/head/helmet/marine/vsd/pyro - belt = /obj/item/belt_harness/marine - suit_store = /obj/item/weapon/gun/flamer/big_flamer/vsd - back = /obj/item/ammo_magazine/flamer_tank/backtank/X - w_uniform = /obj/item/clothing/under/vsd/shirt/webbing - l_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/vsd/spec/flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large, SLOT_IN_SUIT) - -/datum/outfit/job/vsd/spec/demolitionist - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor - head = /obj/item/clothing/head/helmet/marine/vsd - belt = /obj/item/belt_harness/marine - glasses = /obj/item/clothing/glasses/meson - suit_store = /obj/item/weapon/gun/launcher/rocket/vsd - l_pocket = /obj/item/storage/pouch/explosive - -/datum/outfit/job/vsd/spec/demolitionist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - -/datum/outfit/job/vsd/spec/gunslinger - wear_suit = /obj/item/clothing/suit/storage/marine/vsd - head = /obj/item/clothing/head/helmet/marine/vsd/secondary - belt = /obj/item/storage/holster/belt/korovin - w_uniform = /obj/item/clothing/under/vsd/shirt/webbing - -/datum/outfit/job/vsd/spec/gunslinger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/xmdivider/gunslinger(H), SLOT_IN_BELT) - -/datum/outfit/job/vsd/spec/uslspec_one - w_uniform = /obj/item/clothing/under/vsd/upp - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/upp - head = /obj/item/clothing/head/helmet/marine/vsd/upp - mask = /obj/item/clothing/mask/gas/vsd - suit_store = /obj/item/weapon/gun/rifle/type71/flamer - l_pocket = /obj/item/storage/pouch/magazine - -/datum/outfit/job/vsd/spec/uslspec_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) - -/datum/outfit/job/vsd/spec/uslspec_two - w_uniform = /obj/item/clothing/under/vsd/upp - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/upp - head = /obj/item/clothing/head/uppcap/beret - glasses = /obj/item/clothing/glasses/sunglasses/fake - mask = /obj/item/clothing/mask/gas/vsd - suit_store = /obj/item/weapon/gun/clf_heavyrifle - back = /obj/item/shotgunbox/clf_heavyrifle - l_pocket = /obj/item/storage/pouch/grenade - -/datum/outfit/job/vsd/spec/uslspec_two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) - //VSD Juggernauts /datum/job/vsd/juggernaut @@ -557,107 +70,6 @@ /datum/outfit/job/vsd/eod, ) -//juggernaut outfits -/datum/outfit/job/vsd/juggernaut - name = "VSD Juggernaut" - jobtype = /datum/job/vsd/juggernaut - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - glasses = /obj/item/clothing/glasses/meson - w_uniform = /obj/item/clothing/under/vsd/webbing - shoes = /obj/item/clothing/shoes/marine/vsd - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/juggernaut - suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/vsd/juggernaut - mask = /obj/item/clothing/mask/gas/vsd - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/magazine - back = /obj/item/storage/backpack/lightpack/vsd - -/datum/outfit/job/vsd/juggernaut/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - -/datum/outfit/job/vsd/eod - name = "VSD Juggernaut" - jobtype = /datum/job/vsd/juggernaut - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - glasses = /obj/item/clothing/glasses/meson - w_uniform = /obj/item/clothing/under/vsd/webbing - shoes = /obj/item/clothing/shoes/marine/vsd - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/eod - suit_store = /obj/item/weapon/gun/launcher/rocket/vsd - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - head = /obj/item/clothing/head/helmet/marine/vsd/eod - belt = /obj/item/belt_harness/marine - mask = /obj/item/clothing/mask/gas/vsd - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/explosive - back = /obj/item/storage/backpack/lightpack/vsd - -/datum/outfit/job/vsd/eod/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/chemical, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/chemical, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - //VSD Squad Leader /datum/job/vsd/leader job_category = JOB_CAT_COMMAND @@ -671,127 +83,3 @@ /datum/outfit/job/vsd/leader/two, /datum/outfit/job/vsd/leader/upp_three, ) - -//SL outfits -/datum/outfit/job/vsd/leader - name = "VSD Squad Leader" - jobtype = /datum/job/vsd/leader - - id = /obj/item/card/id/silver - ears = /obj/item/radio/headset/distress/vsd - w_uniform = /obj/item/clothing/under/vsd/webbing - shoes = /obj/item/clothing/shoes/marine/vsd - gloves = /obj/item/clothing/gloves/marine/veteran/pmc - r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - l_pocket = /obj/item/storage/pouch/magazine - back = /obj/item/storage/backpack/lightpack/vsd - -/datum/outfit/job/vsd/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - -/datum/outfit/job/vsd/leader/one - head = /obj/item/clothing/head/vsd/beret - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert - mask = /obj/item/clothing/mask/gas/vsd - glasses = /obj/item/clothing/glasses/hud/health - suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard - belt = /obj/item/storage/holster/belt/pistol/standard_pistol - -/datum/outfit/job/vsd/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - -/datum/outfit/job/vsd/leader/two - head = /obj/item/clothing/head/helmet/marine/vsd - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor - mask = /obj/item/clothing/mask/gas/vsd - glasses = /obj/item/clothing/glasses/night/vsd - suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut - belt = /obj/item/storage/holster/belt/korovin - -/datum/outfit/job/vsd/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/xmdivider/gunslinger(H), SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - -/datum/outfit/job/vsd/leader/upp_three - head = /obj/item/clothing/head/uppcap/beret - wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor/upp - mask = /obj/item/clothing/mask/gas/vsd - glasses = /obj/item/clothing/glasses/night/vsd - suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut - belt = /obj/item/storage/holster/belt/pistol/standard_pistol - -/datum/outfit/job/vsd/leader/upp_three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) diff --git a/code/datums/outfit.dm b/code/datums/outfits/_outfit.dm similarity index 100% rename from code/datums/outfit.dm rename to code/datums/outfits/_outfit.dm diff --git a/code/datums/outfits/campaign_asset.dm b/code/datums/outfits/campaign_asset.dm new file mode 100644 index 0000000000000..d697d11e08e95 --- /dev/null +++ b/code/datums/outfits/campaign_asset.dm @@ -0,0 +1,611 @@ +/datum/outfit/job/som/militia/standard + name = "Militia Standard" + jobtype = /datum/job/som/mercenary/militia/standard + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/mainship/som + w_uniform = /obj/item/clothing/under/colonist + shoes = /obj/item/clothing/shoes/marine/clf/full + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + head = /obj/item/clothing/head/strawhat + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pill_bottle/zoom + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/som/militia/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/uzi + belt = /obj/item/storage/belt/knifepouch + suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness + + +/datum/outfit/job/som/militia/standard/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/skorpion + belt = /obj/item/weapon/gun/shotgun/double/sawn + suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness + +/datum/outfit/job/som/militia/standard/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/mpi_km + belt = /obj/item/storage/belt/marine/som + suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard + + +/datum/outfit/job/som/militia/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/shotgun + belt = /obj/item/storage/belt/shotgun + suit_store = /obj/item/weapon/gun/shotgun/pump/standard + +/datum/outfit/job/som/militia/standard/shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/fanatic + head = /obj/item/clothing/head/headband/rambo + wear_suit = /obj/item/clothing/suit/storage/marine/boomvest/fast + belt = /obj/item/weapon/gun/shotgun/double/sawn + suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness + +/datum/outfit/job/som/militia/standard/fanatic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/som_smg + belt = /obj/item/storage/belt/marine/som + suit_store = /obj/item/weapon/gun/smg/som/basic + + +/datum/outfit/job/som/militia/standard/som_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/standard/mpi_grenadier + belt = /obj/item/storage/belt/marine/som + suit_store = /obj/item/weapon/gun/rifle/mpi_km/black/grenadier + + +/datum/outfit/job/som/militia/standard/mpi_grenadier/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/medic + name = "Militia Medic" + jobtype = /datum/job/som/mercenary/militia/medic + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/lifesaver/full/upp + ears = /obj/item/radio/headset/mainship/som + head = /obj/item/clothing/head/tgmcberet/bloodred + w_uniform = /obj/item/clothing/under/colonist + shoes = /obj/item/clothing/shoes/marine/clf/full + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/smg/skorpion + l_pocket = /obj/item/storage/pouch/medical_injectors/medic + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/som/militia/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/militia/medic/uzi + suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness + r_pocket = /obj/item/storage/holster/flarepouch + +/datum/outfit/job/som/militia/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/militia/medic/skorpion + suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness + r_pocket = /obj/item/storage/holster/flarepouch + +/datum/outfit/job/som/militia/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/militia/medic/paladin + suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness + r_pocket = /obj/item/storage/pouch/shotgun + +/datum/outfit/job/som/militia/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/militia/leader + name = "Militia Leader" + jobtype = /datum/job/som/mercenary/militia/leader + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/mainship/som + w_uniform = /obj/item/clothing/under/colonist/webbing + shoes = /obj/item/clothing/shoes/marine/clf/full + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + head = /obj/item/clothing/head/militia + glasses = /obj/item/clothing/glasses/hud/health + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/som/militia/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) + +/datum/outfit/job/som/militia/leader/assault_rifle + suit_store = /obj/item/weapon/gun/rifle/m16/ugl + +/datum/outfit/job/som/militia/leader/assault_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/militia/leader/mpi_km + suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier + belt = /obj/item/storage/belt/marine/som + +/datum/outfit/job/som/militia/leader/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/militia/leader/som_rifle + suit_store = /obj/item/weapon/gun/rifle/som/basic + belt = /obj/item/storage/belt/marine/som + +/datum/outfit/job/som/militia/leader/som_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/militia/leader/upp_rifle + suit_store = /obj/item/weapon/gun/rifle/type71/flamer/standard + +/datum/outfit/job/som/militia/leader/upp_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/militia/leader/lmg_d + suit_store = /obj/item/weapon/gun/rifle/lmg_d/magharness + belt = /obj/item/storage/belt/marine/som + +/datum/outfit/job/som/militia/leader/lmg_d/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/freelancer/standard/one/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/standard/two/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/standard/three/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/medic/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/grenadier/one/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/grenadier/two/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/leader/one/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/freelancer/leader/two/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/pmc/standard/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/pmc/gunner/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/pmc/leader/campaign + ears = /obj/item/radio/headset/mainship + +/datum/outfit/job/icc/standard/mpi_km/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/standard/icc_pdw/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/standard/icc_battlecarbine/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/guard/coilgun/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/guard/icc_autoshotgun/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/medic/icc_machinepistol/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/medic/icc_sharpshooter/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/leader/trenchgun/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/icc/leader/icc_confrontationrifle/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/tgmc/campaign_robot + name = "Combat robot" + jobtype = /datum/job/terragov/squad/standard/campaign_robot + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/mainship + w_uniform = /obj/item/clothing/under/marine/robotic/black_vest + wear_suit = /obj/item/clothing/suit/modular/robot/heavy/tyr + head = /obj/item/clothing/head/modular/robot/heavy/tyr + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/grenade/combat_patrol + back = /obj/item/storage/backpack/marine/satchel + + belt = /obj/item/storage/belt/marine/te_cells + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro + +/datum/outfit/job/tgmc/campaign_robot/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + H.set_species("Combat Robot") + +/datum/outfit/job/tgmc/campaign_robot/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + +/datum/outfit/job/tgmc/campaign_robot/machine_gunner + belt = /obj/item/storage/belt/sparepouch + suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner + +/datum/outfit/job/tgmc/campaign_robot/machine_gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + +/datum/outfit/job/tgmc/campaign_robot/guardian + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro + r_hand = /obj/item/weapon/shield/riot/marine + +/datum/outfit/job/tgmc/campaign_robot/guardian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + +/datum/outfit/job/tgmc/campaign_robot/jetpack + wear_suit = /obj/item/clothing/suit/modular/robot/heavy/shield + r_pocket = /obj/item/storage/pouch/magazine/large + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/mag_harness + back = /obj/item/jetpack_marine/heavy + +/datum/outfit/job/tgmc/campaign_robot/jetpack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) + +/datum/outfit/job/tgmc/campaign_robot/laser_mg + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol + +/datum/outfit/job/tgmc/campaign_robot/laser_mg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + +/datum/outfit/job/vsd/standard/grunt_one/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/standard/ksg/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/standard/grunt_second/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/standard/grunt_third/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/spec/flamer/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/spec/demolitionist/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/spec/gunslinger/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/spec/uslspec_one/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/spec/uslspec_two/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/medic/ksg/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/medic/vsd_rifle/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/engineer/l26/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/engineer/vsd_rifle/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/juggernaut/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/eod/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/leader/one/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/leader/two/campaign + ears = /obj/item/radio/headset/mainship/som + +/datum/outfit/job/vsd/leader/upp_three/campaign + ears = /obj/item/radio/headset/mainship/som diff --git a/code/datums/outfits/clf.dm b/code/datums/outfits/clf.dm new file mode 100644 index 0000000000000..6730c87070d95 --- /dev/null +++ b/code/datums/outfits/clf.dm @@ -0,0 +1,473 @@ +//the base loadout for all clf standards +/datum/outfit/job/clf/standard + name = "CLF Standard" + jobtype = /datum/job/clf/standard + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/colonist + shoes = /obj/item/clothing/shoes/marine/clf/full + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + head = /obj/item/clothing/head/strawhat + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pill_bottle/zoom + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/clf/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/uzi + belt = /obj/item/storage/belt/knifepouch + suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness + + +/datum/outfit/job/clf/standard/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/skorpion + belt = /obj/item/weapon/gun/shotgun/double/sawn + suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness + +/datum/outfit/job/clf/standard/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/mpi_km + belt = /obj/item/storage/belt/marine/som + suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard + + +/datum/outfit/job/clf/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/shotgun + belt = /obj/item/storage/belt/shotgun + suit_store = /obj/item/weapon/gun/shotgun/pump/standard + +/datum/outfit/job/clf/standard/shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/fanatic + head = /obj/item/clothing/head/headband/rambo + wear_suit = /obj/item/clothing/suit/storage/marine/boomvest/fast + belt = /obj/item/weapon/gun/shotgun/double/sawn + suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness + +/datum/outfit/job/clf/standard/fanatic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/som_smg + belt = /obj/item/storage/belt/marine/som + suit_store = /obj/item/weapon/gun/smg/som/basic + + +/datum/outfit/job/clf/standard/som_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/standard/garand + belt = /obj/item/storage/belt/marine/som + suit_store = /obj/item/weapon/gun/rifle/garand + + +/datum/outfit/job/clf/standard/garand/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + +//the base loadout for all clf medics +/datum/outfit/job/clf/medic + name = "CLF Medic" + jobtype = /datum/job/clf/medic + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/lifesaver/full/upp + ears = /obj/item/radio/headset/distress/dutch + head = /obj/item/clothing/head/tgmcberet/bloodred + w_uniform = /obj/item/clothing/under/colonist + shoes = /obj/item/clothing/shoes/marine/clf/full + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/smg/skorpion + l_pocket = /obj/item/storage/pouch/medical_injectors/medic + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/clf/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + +/datum/outfit/job/clf/medic/uzi + suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness + r_pocket = /obj/item/storage/holster/flarepouch + +/datum/outfit/job/clf/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + +/datum/outfit/job/clf/medic/skorpion + suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness + r_pocket = /obj/item/storage/holster/flarepouch + +/datum/outfit/job/clf/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + +/datum/outfit/job/clf/medic/paladin + suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness + r_pocket = /obj/item/storage/pouch/shotgun + +/datum/outfit/job/clf/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + +//The base loadout for all CLF Specialists +/datum/outfit/job/clf/specialist + name = "CLF Specialist" + jobtype = /datum/job/clf/specialist + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/colonist/webbing + shoes = /obj/item/clothing/shoes/black + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + head = /obj/item/clothing/head/helmet/marine + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + + +/datum/outfit/job/clf/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) + +/datum/outfit/job/clf/specialist/dpm + suit_store = /obj/item/weapon/gun/rifle/dpm + +/datum/outfit/job/clf/specialist/dpm/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/clf/specialist/clf_heavyrifle + suit_store = /obj/item/weapon/gun/clf_heavyrifle + back = /obj/item/shotgunbox/clf_heavyrifle + belt = /obj/item/storage/belt/utility/full + +/datum/outfit/job/clf/specialist/clf_heavyrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/clf/specialist/clf_heavymachinegun + suit_store = /obj/item/weapon/gun/icc_hmg + belt = /obj/item/storage/belt/sparepouch + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/clf/specialist/clf_heavymachinegun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +//the base loadout for all clf leaders +/datum/outfit/job/clf/leader + name = "CLF Leader" + jobtype = /datum/job/clf/leader + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/colonist/webbing + shoes = /obj/item/clothing/shoes/black + wear_suit = /obj/item/clothing/suit/storage/faction/militia + gloves = /obj/item/clothing/gloves/black + head = /obj/item/clothing/head/militia + glasses = /obj/item/clothing/glasses/hud/health + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/clf/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) + +/datum/outfit/job/clf/leader/assault_rifle + suit_store = /obj/item/weapon/gun/rifle/m16/ugl + +/datum/outfit/job/clf/leader/assault_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/clf/leader/mpi_km + suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier + belt = /obj/item/storage/belt/marine/som + +/datum/outfit/job/clf/leader/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/clf/leader/som_rifle + suit_store = /obj/item/weapon/gun/rifle/som/basic + belt = /obj/item/storage/belt/marine/som + +/datum/outfit/job/clf/leader/som_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + +/datum/outfit/job/clf/leader/upp_rifle + suit_store = /obj/item/weapon/gun/rifle/type71/flamer/standard + +/datum/outfit/job/clf/leader/upp_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + +/datum/outfit/job/clf/leader/lmg_d + suit_store = /obj/item/weapon/gun/rifle/lmg_d/magharness + belt = /obj/item/storage/belt/marine/som + +/datum/outfit/job/clf/leader/lmg_d/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) diff --git a/code/datums/outfits/deathsquad.dm b/code/datums/outfits/deathsquad.dm new file mode 100644 index 0000000000000..bd7097d2da102 --- /dev/null +++ b/code/datums/outfits/deathsquad.dm @@ -0,0 +1,192 @@ +/datum/outfit/job/deathsquad/standard + name = "Deathsquad Standard" + jobtype = /datum/job/deathsquad/standard + id = /obj/item/card/id/silver + belt = /obj/item/weapon/gun/energy/lasgun/pulse + ears = /obj/item/radio/headset/distress/commando + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando + shoes = /obj/item/clothing/shoes/marine/deathsquad + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/commando + gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando + head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando + mask = /obj/item/clothing/mask/gas/pmc + glasses = /obj/item/clothing/glasses/night/m42_night_goggles + suit_store = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/deathsquad + r_pocket = /obj/item/storage/pouch/medkit + l_pocket = /obj/item/storage/pouch/grenade + back = /obj/item/storage/backpack/commando + implants = list(/obj/item/implant/suicide_dust) + +/datum/outfit/job/deathsquad/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + +/datum/outfit/job/deathsquad/leader + name = "Deathsquad Leader" + jobtype = /datum/job/deathsquad/leader + id = /obj/item/card/id/silver + belt = /obj/item/weapon/gun/energy/lasgun/pulse + ears = /obj/item/radio/headset/distress/commando + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando + shoes = /obj/item/clothing/shoes/marine/deathsquad + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/commando + gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando + head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando + mask = /obj/item/clothing/mask/gas/pmc + glasses = /obj/item/clothing/glasses/night/m42_night_goggles + suit_store = /obj/item/weapon/gun/launcher/rocket/m57a4/deathsquad + r_pocket = /obj/item/storage/pouch/medkit + l_pocket = /obj/item/storage/pouch/explosive + back = /obj/item/storage/backpack/commando + implants = list(/obj/item/implant/suicide_dust) + +/datum/outfit/job/deathsquad/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/pinpointer, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) + +/datum/outfit/job/deathsquad/gunner + name = "Deathsquad Gunner" + jobtype = /datum/job/deathsquad/gunner + id = /obj/item/card/id/silver + belt = /obj/item/weapon/gun/energy/lasgun/pulse + ears = /obj/item/radio/headset/distress/commando + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando + shoes = /obj/item/clothing/shoes/marine/deathsquad + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/commando + gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando + mask = /obj/item/clothing/mask/gas/pmc + head = /obj/item/clothing/head/helmet/marine/veteran/pmc/commando + glasses = /obj/item/clothing/glasses/night/m42_night_goggles + suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/deathsquad + r_pocket = /obj/item/storage/pouch/medkit + l_pocket = /obj/item/storage/pouch/magazine/drum + back = /obj/item/storage/backpack/commando + implants = list(/obj/item/implant/suicide_dust) + +/datum/outfit/job/deathsquad/gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) diff --git a/code/datums/outfits/erp.dm b/code/datums/outfits/erp.dm new file mode 100644 index 0000000000000..7430e8998dfe8 --- /dev/null +++ b/code/datums/outfits/erp.dm @@ -0,0 +1,143 @@ +/datum/outfit/job/erp + name = "ERP Prankster" + jobtype = /datum/job/erp + + id = /obj/item/card/id/captains_spare + ears = /obj/item/radio/headset/distress/erp + mask = /obj/item/clothing/mask/gas/clown_hat + gloves = /obj/item/clothing/gloves/marine/black + back = /obj/item/storage/backpack/clown + shoes = /obj/item/clothing/shoes/clown_shoes/erp + w_uniform = /obj/item/clothing/under/rank/clown/erp + wear_suit = /obj/item/clothing/suit/modular/rownin/erp + head = /obj/item/clothing/head/tgmcberet/red2/erp + l_pocket = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/holster/flarepouch/full + belt = /obj/item/storage/belt/marine + suit_store = /obj/item/weapon/gun/rifle/standard_carbine/beginner + +/datum/outfit/job/erp/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + +/datum/outfit/job/erp/masterprankster + name = "ERP Master Prankster" + jobtype = /datum/job/erp/masterprankster + + head = /obj/item/clothing/head/tgmcberet/red2/erp/masterprankster + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle + +/datum/outfit/job/erp/masterprankster/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + +/datum/outfit/job/erp/boobookisser + name = "ERP Boo-boo kisser" + jobtype = /datum/job/erp/boobookisser + + l_pocket = /obj/item/storage/pouch/medkit/medic + r_pocket = /obj/item/storage/pouch/medical_injectors/medic + belt = /obj/item/storage/belt/lifesaver/full + +/datum/outfit/job/erp/boobookisser/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + +/datum/outfit/job/erp/piethrower + name = "ERP Pie thrower" + jobtype = /datum/job/erp/piethrower + + belt = /obj/item/storage/belt/grenade + suit_store = /obj/item/weapon/gun/grenade_launcher/multinade_launcher/erp + r_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/erp/piethrower/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) diff --git a/code/datums/outfits/freelancers.dm b/code/datums/outfits/freelancers.dm new file mode 100644 index 0000000000000..9a93aeb145a93 --- /dev/null +++ b/code/datums/outfits/freelancers.dm @@ -0,0 +1,309 @@ +//What all freelancers have shared in between them +/datum/outfit/job/freelancer + name = "Freelancer" + jobtype = /datum/job/freelancer + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + mask = /obj/item/clothing/mask/rebreather/scarf/freelancer + w_uniform = /obj/item/clothing/under/marine/veteran/freelancer + belt = /obj/item/storage/belt/marine + wear_suit = /obj/item/clothing/suit/storage/faction/freelancer + shoes = /obj/item/clothing/shoes/marine + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/frelancer + back = /obj/item/storage/backpack/lightpack + l_pocket = /obj/item/storage/pouch/medkit/firstaid + +/datum/outfit/job/freelancer/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife, SLOT_IN_BOOT) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) + +/datum/outfit/job/freelancer/standard + name = "Freelancer Standard" + jobtype = /datum/job/freelancer/standard + +/datum/outfit/job/freelancer/standard/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) + +/datum/outfit/job/freelancer/standard/one + suit_store = /obj/item/weapon/gun/rifle/m16/freelancer + r_pocket = /obj/item/storage/pouch/shotgun + +/datum/outfit/job/freelancer/standard/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + +///m16 ugl +/datum/outfit/job/freelancer/standard/two + suit_store = /obj/item/weapon/gun/rifle/m16/ugl + r_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/freelancer/standard/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + +///tx11 +/datum/outfit/job/freelancer/standard/three + suit_store = /obj/item/weapon/gun/rifle/tx11/freelancerone + r_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/freelancer/standard/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + +/datum/outfit/job/freelancer/medic + name = "Freelancer Medic" + jobtype = /datum/job/freelancer/medic + + belt = /obj/item/storage/belt/lifesaver/full + wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/medic + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/rifle/famas/freelancermedic + r_pocket = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/magazine/large + +/datum/outfit/job/freelancer/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) + +/datum/outfit/job/freelancer/grenadier + name = "Freelancer Veteran" + jobtype = /datum/job/freelancer/grenadier + +/datum/outfit/job/freelancer/grenadier/one + w_uniform = /obj/item/clothing/under/marine/veteran/freelancer/veteran + suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer + r_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/freelancer/grenadier/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + +///machine gunner +/datum/outfit/job/freelancer/grenadier/two + belt = /obj/item/storage/belt/sparepouch + suit_store = /obj/item/weapon/gun/rifle/m412l1_hpr/freelancer + +/datum/outfit/job/freelancer/grenadier/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + +///actual grenadier +/datum/outfit/job/freelancer/grenadier/three + suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer + r_pocket = /obj/item/storage/pouch/magazine/large + +/datum/outfit/job/freelancer/grenadier/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + + +/datum/outfit/job/freelancer/leader + name = "Freelancer Leader" + jobtype = /datum/job/freelancer/leader + +/datum/outfit/job/freelancer/leader + w_uniform = /obj/item/clothing/under/marine/veteran/freelancer/veteran + head = /obj/item/clothing/head/frelancer/beret + glasses = /obj/item/clothing/glasses/hud/health + +/datum/outfit/job/freelancer/leader/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + +/datum/outfit/job/freelancer/leader/one + belt = /obj/item/storage/belt/grenade/b17 + wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader + suit_store = /obj/item/weapon/gun/rifle/m16/freelancer + r_pocket = /obj/item/storage/pouch/shotgun + +/datum/outfit/job/freelancer/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + +///tx11 +/datum/outfit/job/freelancer/leader/two + belt = /obj/item/belt_harness/marine + wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader/two + suit_store = /obj/item/weapon/gun/rifle/tx11/freelancertwo + r_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/freelancer/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + +///tx55 +/datum/outfit/job/freelancer/leader/three + wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader/three + suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer + r_pocket = /obj/item/storage/pouch/magazine/large + +/datum/outfit/job/freelancer/leader/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) diff --git a/code/datums/outfits/icc.dm b/code/datums/outfits/icc.dm new file mode 100644 index 0000000000000..6caa7cb75adf1 --- /dev/null +++ b/code/datums/outfits/icc.dm @@ -0,0 +1,314 @@ +/datum/outfit/job/icc + name = "ICC Standard" + jobtype = /datum/job/icc + + id = /obj/item/card/id/silver + w_uniform = /obj/item/clothing/under/icc/webbing + belt = /obj/item/storage/belt/marine/icc + ears = /obj/item/radio/headset/distress/icc + w_uniform = /obj/item/clothing/under/icc/webbing + shoes = /obj/item/clothing/shoes/marine/icc/knife + wear_suit = /obj/item/clothing/suit/storage/marine/icc + gloves = /obj/item/clothing/gloves/marine/icc + head = /obj/item/clothing/head/helmet/marine/icc + mask = /obj/item/clothing/mask/gas/icc + +// Basic standard equipment +/datum/outfit/job/icc/standard + name = "ICC Standard" + jobtype = /datum/job/icc + + id = /obj/item/card/id/silver + gloves = /obj/item/clothing/gloves/marine/icc/insulated + r_pocket = /obj/item/storage/pouch/pistol/icc + l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid + back = /obj/item/storage/backpack/lightpack/icc + + +/datum/outfit/job/icc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/icc_dpistol, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + +/datum/outfit/job/icc/standard/mpi_km + suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard + +/datum/outfit/job/icc/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + +/datum/outfit/job/icc/standard/icc_pdw + suit_store = /obj/item/weapon/gun/smg/icc_pdw/standard + +/datum/outfit/job/icc/standard/icc_pdw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + +/datum/outfit/job/icc/standard/icc_battlecarbine + suit_store = /obj/item/weapon/gun/rifle/icc_battlecarbine/standard + +/datum/outfit/job/icc/standard/icc_battlecarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + +/datum/outfit/job/icc/standard/icc_assaultcarbine + suit_store = /obj/item/weapon/gun/rifle/icc_assaultcarbine + +/datum/outfit/job/icc/standard/icc_assaultcarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + +/datum/outfit/job/icc/guard + name = "ICC Guard" + jobtype = /datum/job/icc/guard + + shoes = /obj/item/clothing/shoes/marine/icc/guard/knife + wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard + gloves = /obj/item/clothing/gloves/marine/icc/guard + head = /obj/item/clothing/head/helmet/marine/icc/guard + + +/datum/outfit/job/icc/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tramadol, SLOT_IN_ACCESSORY) + + +/datum/outfit/job/icc/guard/coilgun + suit_store = /obj/item/weapon/gun/launcher/rocket/icc + back = /obj/item/weapon/gun/rifle/icc_coilgun + l_pocket = /obj/item/storage/pouch/explosive/icc + r_pocket = /obj/item/storage/pouch/explosive/icc + +/datum/outfit/job/icc/guard/coilgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/thermobaric, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/thermobaric, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/heat, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/heat, SLOT_IN_L_POUCH) + + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + +/datum/outfit/job/icc/guard/icc_autoshotgun + suit_store = /obj/item/weapon/gun/rifle/icc_coilgun + back = /obj/item/weapon/gun/rifle/icc_autoshotgun/guard + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc + +/datum/outfit/job/icc/guard/icc_autoshotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) + +/datum/outfit/job/icc/guard/icc_bagmg + wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard/heavy + head = /obj/item/clothing/head/helmet/marine/icc/guard/heavy + suit_store = /obj/item/weapon/gun/rifle/icc_coilgun + back = /obj/item/storage/holster/icc_mg/full + belt = /obj/item/ammo_magazine/icc_mg/belt + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc + +/datum/outfit/job/icc/guard/icc_bagmg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + +/datum/outfit/job/icc/medic + name = "ICC Medic" + jobtype = /datum/job/icc/medic + + id = /obj/item/card/id/silver + gloves = /obj/item/clothing/gloves/marine/icc + back = /obj/item/storage/backpack/lightpack/icc + belt = /obj/item/storage/belt/lifesaver/icc/ert + glasses = /obj/item/clothing/glasses/hud/health + +/datum/outfit/job/icc/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + +/datum/outfit/job/icc/medic/icc_machinepistol + suit_store = /obj/item/weapon/gun/smg/icc_machinepistol/medic + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc + +/datum/outfit/job/icc/medic/icc_machinepistol/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) + +/datum/outfit/job/icc/medic/icc_sharpshooter + suit_store = /obj/item/weapon/gun/rifle/icc_sharpshooter/medic + l_pocket = /obj/item/storage/pouch/magazine/large/icc + r_pocket = /obj/item/storage/pouch/magazine/large/icc + +/datum/outfit/job/icc/medic/icc_sharpshooter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) + +/datum/outfit/job/icc/leader + name = "ICC Leader" + jobtype = /datum/job/icc/leader + + shoes = /obj/item/clothing/shoes/marine/icc/knife + wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard + gloves = /obj/item/clothing/gloves/marine/icc/guard + head = /obj/item/clothing/head/helmet/marine/icc/guard + back = /obj/item/storage/backpack/lightpack/icc/guard + l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid + r_pocket = /obj/item/storage/pouch/construction/icc/full + + +/datum/outfit/job/icc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + +/datum/outfit/job/icc/leader/ml101 + suit_store = /obj/item/weapon/gun/shotgun/pump/icc_heavyshotgun/icc_leader + belt = /obj/item/storage/belt/shotgun/icc/mixed + +/datum/outfit/job/icc/leader/icc_confrontationrifle + belt = /obj/item/storage/belt/marine/icc + suit_store = /obj/item/weapon/gun/rifle/icc_confrontationrifle/leader + +/datum/outfit/job/icc/leader/icc_confrontationrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) diff --git a/code/datums/outfits/imperium.dm b/code/datums/outfits/imperium.dm new file mode 100644 index 0000000000000..4c518085f103e --- /dev/null +++ b/code/datums/outfits/imperium.dm @@ -0,0 +1,90 @@ +/datum/outfit/job/imperial + name = "Imperial Standard" + jobtype = /datum/job/imperial + + id = /obj/item/card/id + ears = /obj/item/radio/headset/distress/imperial + w_uniform = /obj/item/clothing/under/marine/imperial + shoes = /obj/item/clothing/shoes/marine/imperial + gloves = /obj/item/clothing/gloves/marine + +/datum/outfit/job/imperial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.grant_language(/datum/language/imperial) + +/datum/outfit/job/imperial/guardsman + name = "Imperial Guardsman" + jobtype = /datum/job/imperial/guardsman + + belt = /obj/item/storage/belt/marine/te_cells + wear_suit = /obj/item/clothing/suit/storage/marine/imperial + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle + head = /obj/item/clothing/head/helmet/marine/imperial + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/holster/flarepouch/full + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/imperial/guardsman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) + +/datum/outfit/job/imperial/guardsman/sergeant + name = "Guardsman Sergeant" + jobtype = /datum/job/imperial/guardsman/sergeant + + wear_suit = /obj/item/clothing/suit/storage/marine/imperial/sergeant + head = /obj/item/clothing/head/helmet/marine/imperial/sergeant + r_pocket = /obj/item/storage/pouch/explosive/upp + l_pocket = /obj/item/storage/pouch/field_pouch/full + +/datum/outfit/job/imperial/guardsman/medicae + name = "Guardsman Medicae" + jobtype = /datum/job/imperial/guardsman/medicae + + belt = /obj/item/storage/belt/lifesaver/full + wear_suit = /obj/item/clothing/suit/storage/marine/imperial/medicae + glasses = /obj/item/clothing/glasses/hud/health + l_pocket = /obj/item/storage/pouch/medkit/medic + r_pocket = /obj/item/storage/pouch/medical_injectors/medic + +/datum/outfit/job/imperial/guardsman/medicae/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/zoom, SLOT_IN_BACKPACK) // closest thing to combat performance drugs + +/datum/outfit/job/imperial/commissar + name = "Imperial Commissar" + jobtype = /datum/job/imperial/commissar + + belt = /obj/item/storage/holster/belt/mateba/full //Ideally this can be later replaced with a bolter + w_uniform = /obj/item/clothing/under/marine/imperial/commissar + wear_suit = /obj/item/clothing/suit/storage/marine/imperial/commissar + suit_store = /obj/item/weapon/sword/commissar_sword + gloves = /obj/item/clothing/gloves/marine/commissar + head = /obj/item/clothing/head/commissar + l_pocket = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/pouch/magazine/pistol/large/mateba + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/imperial/commissar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) diff --git a/code/datums/outfits/job.dm b/code/datums/outfits/job.dm new file mode 100644 index 0000000000000..db596d50b363d --- /dev/null +++ b/code/datums/outfits/job.dm @@ -0,0 +1,24 @@ +/datum/outfit/job + var/jobtype + +/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + return + +/datum/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + return + +/datum/outfit/job/proc/handle_id(mob/living/carbon/human/H) + var/datum/job/job = H.job ? H.job : SSjob.GetJobType(jobtype) + var/obj/item/card/id/id = H.wear_id + if(!istype(id)) + return + id.access = job.get_access() + id.iff_signal = GLOB.faction_to_iff[job.faction] + shuffle_inplace(id.access) // Shuffle access list to make NTNet passkeys less predictable + id.registered_name = H.real_name + id.assignment = job.title + id.rank = job.title + id.paygrade = job.paygrade + id.update_label() + if(H.mind?.initial_account) // In most cases they won't have a mind at this point. + id.associated_account_number = H.mind.initial_account.account_number diff --git a/code/datums/outfits/marines.dm b/code/datums/outfits/marines.dm new file mode 100644 index 0000000000000..27cff2f1fa5b2 --- /dev/null +++ b/code/datums/outfits/marines.dm @@ -0,0 +1,41 @@ +/datum/outfit/job/marine/standard + name = SQUAD_MARINE + jobtype = /datum/job/terragov/squad/standard + + id = /obj/item/card/id/dogtag + +/datum/outfit/job/marine/engineer + name = SQUAD_ENGINEER + jobtype = /datum/job/terragov/squad/engineer + + id = /obj/item/card/id/dogtag/engineer + +/datum/outfit/job/marine/corpsman + name = SQUAD_CORPSMAN + jobtype = /datum/job/terragov/squad/corpsman + + id = /obj/item/card/id/dogtag/corpsman + +/datum/outfit/job/marine/smartgunner + name = SQUAD_SMARTGUNNER + jobtype = /datum/job/terragov/squad/smartgunner + + id = /obj/item/card/id/dogtag/smartgun + +/datum/outfit/job/marine/specialist + name = SQUAD_SPECIALIST + jobtype = /datum/job/terragov/squad/specialist + + id = /obj/item/card/id/dogtag + head = /obj/item/clothing/head/helmet/specrag + +/datum/outfit/job/marine/leader + name = SQUAD_LEADER + jobtype = /datum/job/terragov/squad/leader + + id = /obj/item/card/id/dogtag/leader + +/datum/outfit/job/marine/vatgrown + name = SQUAD_VATGROWN + jobtype = /datum/job/terragov/squad/vatgrown + id = /obj/item/card/id/dogtag diff --git a/code/datums/outfits/mercenaries.dm b/code/datums/outfits/mercenaries.dm new file mode 100644 index 0000000000000..69f6ec08500c0 --- /dev/null +++ b/code/datums/outfits/mercenaries.dm @@ -0,0 +1,43 @@ +/datum/outfit/job/mercenaries/heavy + name = "Mercenary Heavy" + jobtype = /datum/job/mercenaries/heavy + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/marine/veteran/mercenary + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary + gloves = /obj/item/clothing/gloves/combat + head = /obj/item/clothing/head/helmet/marine/veteran/mercenary + mask = /obj/item/clothing/mask/gas/pmc + back = /obj/item/storage/backpack/satchel/norm + +/datum/outfit/job/mercenaries/miner + name = "Mercenary Miner" + jobtype = /datum/job/mercenaries/miner + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/miner + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner + gloves = /obj/item/clothing/gloves/combat + head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner + mask = /obj/item/clothing/mask/gas/pmc + back = /obj/item/storage/backpack/satchel/norm + +/datum/outfit/job/mercenaries/engineer + name = "Mercenary Engineer" + jobtype = /datum/job/mercenaries/engineer + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/engineer + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/engineer + gloves = /obj/item/clothing/gloves/combat + head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/engineer + glasses = /obj/item/clothing/glasses/welding/flipped + mask = /obj/item/clothing/mask/gas/pmc + back = /obj/item/storage/backpack/satchel/eng diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm new file mode 100644 index 0000000000000..5760f6a56637e --- /dev/null +++ b/code/datums/outfits/misc.dm @@ -0,0 +1,57 @@ +/datum/outfit/job/other/colonist + name = "Colonist" + jobtype = /datum/job/colonist + + id = /obj/item/card/id + w_uniform = /obj/item/clothing/under/colonist + shoes = /obj/item/clothing/shoes/marine + l_pocket = /obj/item/storage/pouch/survival/full + r_pocket = /obj/item/radio + +/datum/outfit/job/other/pizza + name = "Pizza Deliverer" + jobtype = /datum/job/pizza + + id = /obj/item/card/id/silver + w_uniform = /obj/item/clothing/under/pizza + belt = /obj/item/weapon/gun/pistol/holdout + shoes = /obj/item/clothing/shoes/red + gloves = /obj/item/clothing/gloves/black + head = /obj/item/clothing/head/soft/red + r_pocket = /obj/item/radio + l_pocket = /obj/item/reagent_containers/food/drinks/cans/dr_gibb + back = /obj/item/storage/backpack/satchel + r_hand = /obj/item/pizzabox/random + +/datum/outfit/job/other/spatial_agent + name = "Spatial Agent" + jobtype = /datum/job/spatial_agent + + id = /obj/item/card/id/silver + w_uniform = /obj/item/clothing/under/rank/centcom_commander/sa + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/marinechief/sa + gloves = /obj/item/clothing/gloves/marine/officer/chief/sa + glasses = /obj/item/clothing/glasses/hud/sa/nodrop + back = /obj/item/storage/backpack/marine/satchel + +/datum/outfit/job/other/spatial_agent/galaxy_red + w_uniform = /obj/item/clothing/under/liaison_suit/galaxy_red + belt = null + back = null + +/datum/outfit/job/other/spatial_agent/galaxy_blue + w_uniform = /obj/item/clothing/under/liaison_suit/galaxy_blue + belt = null + back = null + +/datum/outfit/job/other/spatial_agent/xeno_suit + head = /obj/item/clothing/head/xenos + wear_suit = /obj/item/clothing/suit/xenos + +/datum/outfit/job/other/spatial_agent/marine_officer + w_uniform = /obj/item/clothing/under/marine/officer/bridge + head = /obj/item/clothing/head/beret/marine + belt = /obj/item/storage/holster/belt/pistol/m4a3/officer + back = null + shoes = /obj/item/clothing/shoes/marine/full diff --git a/code/datums/outfits/pmc.dm b/code/datums/outfits/pmc.dm new file mode 100644 index 0000000000000..11e1551e311ce --- /dev/null +++ b/code/datums/outfits/pmc.dm @@ -0,0 +1,199 @@ +/datum/outfit/job/pmc/standard + name = "PMC Standard" + jobtype = /datum/job/pmc/standard + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/pmc + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/veteran/pmc + mask = /obj/item/clothing/mask/gas/pmc/leader + suit_store = /obj/item/weapon/gun/smg/m25/elite/pmc + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/satchel + + +/datum/outfit/job/pmc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) + +/datum/outfit/job/pmc/gunner + name = "PMC Gunner" + jobtype = /datum/job/pmc/gunner + + id = /obj/item/card/id/silver + belt = /obj/item/belt_harness/marine + ears = /obj/item/radio/headset/distress/pmc + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/gunner + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner + mask = /obj/item/clothing/mask/gas/pmc + glasses = /obj/item/clothing/glasses/night/m56_goggles + suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc + r_pocket = /obj/item/storage/pouch/explosive + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/pmc/gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/mine/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/mine/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) + +/datum/outfit/job/pmc/sniper + name = "PMC Sniper" + jobtype = /datum/job/pmc/sniper + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70_pmc + ears = /obj/item/radio/headset/distress/pmc + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/webbing + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper + mask = /obj/item/clothing/mask/gas/pmc + glasses = /obj/item/clothing/glasses/night/m42_night_goggles + suit_store = /obj/item/weapon/gun/rifle/sniper/elite + r_pocket = /obj/item/storage/pouch/magazine/large/pmc_sniper + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/satchel + + +/datum/outfit/job/pmc/sniper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/pmc, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) + +/datum/outfit/job/pmc/leader + name = "PMC Leader" + jobtype = /datum/job/pmc/leader + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/pmc + w_uniform = /obj/item/clothing/under/marine/veteran/pmc/leader/holster + shoes = /obj/item/clothing/shoes/veteran/pmc + wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/leader + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/veteran/pmc/leader + mask = /obj/item/clothing/mask/gas/pmc/leader + glasses = /obj/item/clothing/glasses/night/m42_night_goggles + suit_store = /obj/item/weapon/gun/rifle/m412/elite + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/satchel + + +/datum/outfit/job/pmc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78/pmc(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) diff --git a/code/datums/quick_load_beginners.dm b/code/datums/outfits/quick_load_beginners.dm similarity index 100% rename from code/datums/quick_load_beginners.dm rename to code/datums/outfits/quick_load_beginners.dm diff --git a/code/datums/quick_load_civil_war.dm b/code/datums/outfits/quick_load_civil_war.dm similarity index 100% rename from code/datums/quick_load_civil_war.dm rename to code/datums/outfits/quick_load_civil_war.dm diff --git a/code/datums/quick_load_outfits.dm b/code/datums/outfits/quick_load_outfits.dm similarity index 100% rename from code/datums/quick_load_outfits.dm rename to code/datums/outfits/quick_load_outfits.dm diff --git a/code/datums/quick_load_robots.dm b/code/datums/outfits/quick_load_robots.dm similarity index 100% rename from code/datums/quick_load_robots.dm rename to code/datums/outfits/quick_load_robots.dm diff --git a/code/datums/outfits/retired.dm b/code/datums/outfits/retired.dm new file mode 100644 index 0000000000000..ad49b651e672d --- /dev/null +++ b/code/datums/outfits/retired.dm @@ -0,0 +1,67 @@ +/datum/outfit/job/retired + name = "TGMC retired veteran" + jobtype = /datum/job/retired + + id = /obj/item/card/id/dogtag + wear_suit = /obj/item/clothing/suit/storage/marine/officer/req //it's pas + glasses = /obj/item/clothing/glasses/eyepatch + w_uniform = /obj/item/clothing/under/marine/service + mask = /obj/item/clothing/mask/cigarette/pipe + head = /obj/item/clothing/head/servicecap + back = /obj/item/storage/backpack/satchel + belt = /obj/item/storage/belt/marine + gloves = /obj/item/clothing/gloves/marine/black + l_pocket = /obj/item/storage/pouch/medkit/firstaid + r_pocket = /obj/item/storage/holster/flarepouch/full + suit_store = /obj/item/weapon/gun/rifle/m41a/magharness + ears = /obj/item/radio/headset/distress/retired + shoes = /obj/item/clothing/shoes/marine/brown/full + +/datum/outfit/job/retired/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + + var/list/limbs = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) + for(var/i in 1 to 2) + var/datum/limb/picked_limb = H.get_limb(pick_n_take(limbs)) + picked_limb.robotize() + + +/datum/outfit/job/retired/leader + name = "TGMC retired veteran expedition leader" + jobtype = /datum/job/retired/leader + + id = /obj/item/card/id/dogtag/fc + head = /obj/item/clothing/head/tgmcberet/fc + gloves = /obj/item/clothing/gloves/marine/officer + w_uniform = /obj/item/clothing/under/marine/officer/exec + belt = /obj/item/storage/holster/blade/officer/full + suit_store = /obj/item/storage/holster/belt/mateba/full + back = /obj/item/ammo_magazine/minigun_wheelchair + shoes = null + +/datum/outfit/job/retired/leader/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + + H.amputate_limb(BODY_ZONE_L_LEG) + H.amputate_limb(BODY_ZONE_R_LEG) + var/obj/vehicle/ridden/wheelchair/weaponized/wheelchair = new(H.drop_location()) + wheelchair.buckle_mob(H, TRUE) + diff --git a/code/datums/outfits/sectoid.dm b/code/datums/outfits/sectoid.dm new file mode 100644 index 0000000000000..f22cd69157e91 --- /dev/null +++ b/code/datums/outfits/sectoid.dm @@ -0,0 +1,62 @@ +/datum/outfit/job/sectoid + name = "Sectoid Grunt" + jobtype = /datum/job/sectoid + + id = /obj/item/card/id + belt = /obj/item/storage/belt/marine/sectoid + head = /obj/item/clothing/head/helmet/sectoid + ears = /obj/item/radio/headset/distress/sectoid + w_uniform = /obj/item/clothing/under/sectoid + glasses = /obj/item/clothing/glasses/night/sectoid + shoes = /obj/item/clothing/shoes/sectoid + wear_suit = /obj/item/clothing/suit/armor/sectoid + gloves = /obj/item/clothing/gloves/sectoid + r_pocket = /obj/item/stack/medical/heal_pack/gauze/sectoid + l_pocket = /obj/item/explosive/grenade/sectoid + back = /obj/item/weapon/gun/rifle/sectoid_rifle + + var/list/abilities = list( + /datum/action/ability/activable/sectoid/mindmeld, + /datum/action/ability/activable/sectoid/mindfray, + ) + +/datum/outfit/job/sectoid/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.set_species("Sectoid") + + H.name = GLOB.namepool[/datum/namepool/sectoid].random_name(H) + H.real_name = H.name + + for(var/ability in abilities) + H.add_ability(ability) + +/datum/outfit/job/sectoid/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BELT) + +/datum/outfit/job/sectoid/psionic + abilities = list( + /datum/action/ability/activable/sectoid/mindmeld, + /datum/action/ability/activable/sectoid/mindfray, + /datum/action/ability/activable/sectoid/reknit_form, + /datum/action/ability/activable/sectoid/stasis, + ) + +/datum/outfit/job/sectoid/leader + name = "Sectoid Leader" + jobtype = /datum/job/sectoid/leader + wear_suit = /obj/item/clothing/suit/armor/sectoid/shield + abilities = list( + /datum/action/ability/activable/sectoid/mindmeld/greater, + /datum/action/ability/activable/sectoid/mindfray, + /datum/action/ability/activable/sectoid/reknit_form/greater, + /datum/action/ability/activable/sectoid/stasis, + /datum/action/ability/activable/sectoid/fuse, + /datum/action/ability/activable/psionic_interact, + /datum/action/ability/activable/sectoid/reanimate, + ) diff --git a/code/datums/outfits/shipside.dm b/code/datums/outfits/shipside.dm new file mode 100644 index 0000000000000..6437f506b08b1 --- /dev/null +++ b/code/datums/outfits/shipside.dm @@ -0,0 +1,351 @@ +/datum/outfit/job/command/captain + name = CAPTAIN + jobtype = /datum/job/terragov/command/captain + + id = /obj/item/card/id/gold + belt = /obj/item/storage/holster/belt/pistol/smart_pistol/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/command + shoes = /obj/item/clothing/shoes/marinechief/captain + gloves = /obj/item/clothing/gloves/marine/techofficer/captain + head = /obj/item/clothing/head/beret/marine/captain + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/leadership + back = /obj/item/storage/backpack/marine/satchel/captain_cloak + +/datum/outfit/job/command/captain/robot + species = SPECIES_COMBAT_ROBOT + + w_uniform = /obj/item/clothing/under/marine/robotic + shoes = null + gloves = null + head = /obj/item/clothing/head/modular/robot + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/leadership + +/datum/outfit/job/command/captain_campaign + name = CAPTAIN + jobtype = /datum/job/terragov/command/captain + + id = /obj/item/card/id/gold + +/datum/outfit/job/command/fieldcommander + name = FIELD_COMMANDER + jobtype = /datum/job/terragov/command/fieldcommander + + id = /obj/item/card/id/dogtag/fc + belt = /obj/item/storage/holster/blade/officer/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/exec + wear_suit = /obj/item/clothing/suit/modular/xenonauten + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine/officer + head = /obj/item/clothing/head/tgmcberet/fc + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/fieldcommand + suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander + +/datum/outfit/job/command/fieldcommander/robot + species = SPECIES_COMBAT_ROBOT + + w_uniform = /obj/item/clothing/under/marine/robotic + wear_suit = /obj/item/clothing/suit/modular/robot + shoes = null + gloves = null + head = /obj/item/clothing/head/modular/robot + r_pocket = /obj/item/storage/pouch/general/large/command + l_pocket = /obj/item/hud_tablet/fieldcommand + suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander + +/datum/outfit/job/command/fieldcommander_campaign + name = FIELD_COMMANDER + jobtype = /datum/job/terragov/command/fieldcommander/campaign + + id = /obj/item/card/id/dogtag/fc + +/datum/outfit/job/command/staffofficer + name = STAFF_OFFICER + jobtype = /datum/job/terragov/command/staffofficer + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/pistol/m4a3/officer + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/bridge + shoes = /obj/item/clothing/shoes/marine/full + head = /obj/item/clothing/head/tgmccap/ro + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/binoculars/tactical + + +/datum/outfit/job/command/staffofficer/robot + species = SPECIES_COMBAT_ROBOT + + w_uniform = /obj/item/clothing/under/marine/robotic + shoes = null + gloves = null + head = /obj/item/clothing/head/modular/robot + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/binoculars/tactical + +/datum/outfit/job/command/staffofficer_campaign + name = STAFF_OFFICER + jobtype = /datum/job/terragov/command/staffofficer + + id = /obj/item/card/id/silver + +/datum/outfit/job/command/transportofficer + name = TRANSPORT_OFFICER + jobtype = /datum/job/terragov/command/transportofficer + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/pilot + wear_suit = /obj/item/clothing/suit/storage/marine/pilot + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine/insulated + glasses = /obj/item/clothing/glasses/welding/superior + head = /obj/item/clothing/head/helmet/marine/pilot + r_pocket = /obj/item/storage/pouch/construction + l_pocket = /obj/item/hud_tablet/transportofficer + back = /obj/item/storage/backpack/marine/engineerpack + suit_store = /obj/item/storage/holster/belt/pistol/m4a3/vp70 + +/datum/outfit/job/command/transportofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + +/datum/outfit/job/command/pilot + name = PILOT_OFFICER + jobtype = /datum/job/terragov/command/pilot + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70 + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/pilot + wear_suit = /obj/item/clothing/suit/storage/marine/pilot + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine/insulated + glasses = /obj/item/clothing/glasses/sunglasses/aviator + head = /obj/item/clothing/head/helmet/marine/pilot + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/hud_tablet/pilot + +/datum/outfit/job/command/mech_pilot + name = MECH_PILOT + jobtype = /datum/job/terragov/command/mech_pilot + + id = /obj/item/card/id/dogtag + belt = /obj/item/storage/belt/utility/full + glasses = /obj/item/clothing/glasses/welding + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/mech + wear_suit = /obj/item/clothing/suit/storage/marine/mech_pilot + head = /obj/item/clothing/head/helmet/marine/mech_pilot + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine + +/datum/outfit/job/command/mech_pilot/fallen + ears = null + +/datum/outfit/job/command/assault_crewman + name = ASSAULT_CREWMAN + jobtype = /datum/job/terragov/command/assault_crewman + + id = /obj/item/card/id/dogtag + belt = /obj/item/storage/belt/utility/full + glasses = /obj/item/clothing/glasses/welding + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/assault_crewman + wear_suit = /obj/item/clothing/suit/storage/marine/assault_crewman + head = /obj/item/clothing/head/helmet/marine/assault_crewman + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine + l_pocket = /obj/item/pamphlet/tank_loader + +/datum/outfit/job/command/transport_crewman + name = TRANSPORT_CREWMAN + jobtype = /datum/job/terragov/command/transport_crewman + + id = /obj/item/card/id/dogtag + belt = /obj/item/storage/belt/utility/full + glasses = /obj/item/clothing/glasses/welding + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/transport_crewman + wear_suit = /obj/item/clothing/suit/storage/marine/transport_crewman + head = /obj/item/clothing/head/helmet/marine/transport_crewman + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine + +/datum/outfit/job/engineering/chief + name = CHIEF_SHIP_ENGINEER + jobtype = /datum/job/terragov/engineering/chief + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/ce + wear_suit = /obj/item/clothing/suit/storage/marine/officer/req + shoes = /obj/item/clothing/shoes/marine/full + glasses = /obj/item/clothing/glasses/welding/superior + gloves = /obj/item/clothing/gloves/insulated + head = /obj/item/clothing/head/beret/marine/techofficer + r_pocket = /obj/item/storage/pouch/construction + back = /obj/item/storage/backpack/marine/engineerpack + +/datum/outfit/job/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + +/datum/outfit/job/engineering/tech + name = SHIP_TECH + jobtype = /datum/job/terragov/engineering/tech + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/st + w_uniform = /obj/item/clothing/under/marine/officer/engi + wear_suit = /obj/item/clothing/suit/storage/marine/ship_tech + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/insulated + glasses = /obj/item/clothing/glasses/welding/flipped + head = /obj/item/clothing/head/tgmccap/req + r_pocket = /obj/item/storage/pouch/general/medium + back = /obj/item/storage/backpack/marine/engineerpack + +/datum/outfit/job/requisitions/officer + name = REQUISITIONS_OFFICER + jobtype = /datum/job/terragov/requisitions/officer + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/m44/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/ro_suit + wear_suit = /obj/item/clothing/suit/storage/marine/officer/req + suit_store = /obj/item/weapon/gun/energy/taser + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/insulated + head = /obj/item/clothing/head/tgmccap/req + r_pocket = /obj/item/storage/pouch/general/large + +/datum/outfit/job/requisitions/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/supplytablet, SLOT_IN_R_POUCH) + +/datum/outfit/job/medical/professor + name = CHIEF_MEDICAL_OFFICER + jobtype = /datum/job/terragov/medical/professor + + id = /obj/item/card/id + belt = /obj/item/storage/belt/rig/medical + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/rank/medical/blue + wear_suit = /obj/item/clothing/suit/storage/labcoat/cmo + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + head = /obj/item/clothing/head/cmo + r_pocket = /obj/item/storage/pouch/surgery + l_pocket = /obj/item/storage/pouch/medkit/doctor + + +/datum/outfit/job/medical/professor/robot + species = SPECIES_COMBAT_ROBOT + + w_uniform = /obj/item/clothing/under/marine/robotic + shoes = null + gloves = null + +/datum/outfit/job/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) + +/datum/outfit/job/medical/medicalofficer + name = MEDICAL_DOCTOR + jobtype = /datum/job/terragov/medical/medicalofficer + + id = /obj/item/card/id + belt = /obj/item/storage/belt/rig/medical + ears = /obj/item/radio/headset/mainship/doc + w_uniform = /obj/item/clothing/under/rank/medical/purple + wear_suit = /obj/item/clothing/suit/storage/labcoat + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + head = /obj/item/clothing/head/surgery/purple + r_pocket = /obj/item/storage/pouch/surgery + l_pocket = /obj/item/storage/pouch/medkit/doctor + + +/datum/outfit/job/medical/medicalofficer/robot + species = SPECIES_COMBAT_ROBOT + jobtype = /datum/job/terragov/medical/medicalofficer + + w_uniform = /obj/item/clothing/under/marine/robotic + shoes = null + gloves = null + +/datum/outfit/job/medical/medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) + +/datum/outfit/job/medical/researcher + name = MEDICAL_RESEARCHER + jobtype = /datum/job/terragov/medical/researcher + + id = /obj/item/card/id + belt = /obj/item/storage/belt/rig/research + ears = /obj/item/radio/headset/mainship/res + w_uniform = /obj/item/clothing/under/marine/officer/researcher + wear_suit = /obj/item/clothing/suit/storage/labcoat/researcher + shoes = /obj/item/clothing/shoes/laceup + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + r_pocket = /obj/item/storage/pouch/surgery + l_pocket = /obj/item/storage/pouch/medkit/doctor + + +/datum/outfit/job/medical/researcher/robot + species = SPECIES_COMBAT_ROBOT + + w_uniform = /obj/item/clothing/under/marine/robotic + shoes = null + gloves = null + +/datum/outfit/job/medical/researcher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) + +/datum/outfit/job/civilian/liaison + name = CORPORATE_LIAISON + jobtype = /datum/job/terragov/civilian/liaison + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/liaison_suit + shoes = /obj/item/clothing/shoes/laceup + +/datum/outfit/job/civilian/synthetic + name = SYNTHETIC + jobtype = /datum/job/terragov/silicon/synthetic + + id = /obj/item/card/id/gold + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/rank/synthetic + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/insulated + r_pocket = /obj/item/storage/pouch/general/medium + l_pocket = /obj/item/storage/pouch/general/medium diff --git a/code/datums/outfits/skeleton.dm b/code/datums/outfits/skeleton.dm new file mode 100644 index 0000000000000..e1323df6d4bdf --- /dev/null +++ b/code/datums/outfits/skeleton.dm @@ -0,0 +1,43 @@ +/datum/outfit/job/skeleton/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.set_species("Skeleton") + + H.name = GLOB.namepool[/datum/namepool/skeleton].random_name(H) + H.real_name = H.name + +/datum/outfit/job/skeleton/basic + name = "Skeleton Man" + jobtype = /datum/job/skeleton/basic + + id = /obj/item/card/id + w_uniform = /obj/item/clothing/under/gladiator + shoes = /obj/item/clothing/shoes/sandal + head = /obj/item/clothing/head/helmet/gladiator + belt = /obj/item/weapon/sword + back = /obj/item/weapon/twohanded/spear + ears = /obj/item/radio/headset/survivor + r_pocket = /obj/item/flashlight + l_pocket = /obj/item/tool/crowbar/red + +/datum/outfit/job/skeleton/basic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/milk, SLOT_L_HAND) + +/datum/outfit/job/skeleton/leader + name = "Skeleton Commander" + jobtype = /datum/job/skeleton/leader + + id = /obj/item/card/id + w_uniform = /obj/item/clothing/under/gladiator + shoes = /obj/item/clothing/shoes/sandal + head = /obj/item/clothing/head/helmet/gladiator + belt = /obj/item/weapon/sword + back = /obj/item/weapon/twohanded/glaive + ears = /obj/item/radio/headset/survivor + r_pocket = /obj/item/flashlight + l_pocket = /obj/item/reagent_containers/food/drinks/milk + +/datum/outfit/job/skeleton/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/milk, SLOT_L_HAND) diff --git a/code/datums/outfits/som.dm b/code/datums/outfits/som.dm new file mode 100644 index 0000000000000..2e56e326383ba --- /dev/null +++ b/code/datums/outfits/som.dm @@ -0,0 +1,34 @@ +/datum/outfit/job/som/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.underwear = 10 + H.undershirt = H.undershirt ? 10 : 0 + H.regenerate_icons() + +/datum/outfit/job/som/squad/standard + name = "SOM Standard" + jobtype = /datum/job/som/squad/standard + + id = /obj/item/card/id/dogtag/som + +/datum/outfit/job/som/squad/engineer + name = "SOM Engineer" + jobtype = /datum/job/som/squad/engineer + + id = /obj/item/card/id/dogtag/som + +/datum/outfit/job/som/squad/medic + name = "SOM Medic" + jobtype = /datum/job/som/squad/medic + + id = /obj/item/card/id/dogtag/som + +/datum/outfit/job/som/squad/veteran + name = "SOM Veteran" + jobtype = /datum/job/som/squad/veteran + id = /obj/item/card/id/dogtag/som + +/datum/outfit/job/som/squad/leader + name = "SOM Leader" + jobtype = /datum/job/som/squad/leader + + id = /obj/item/card/id/dogtag/som diff --git a/code/datums/outfits/som_ert.dm b/code/datums/outfits/som_ert.dm new file mode 100644 index 0000000000000..af44da634296e --- /dev/null +++ b/code/datums/outfits/som_ert.dm @@ -0,0 +1,757 @@ +/datum/outfit/job/som/ert + id = /obj/item/card/id/dogtag/som + +//Base SOM standard outfit +/datum/outfit/job/som/ert/standard + name = "SOM Marine" + jobtype = /datum/job/som/ert/standard + + ears = /obj/item/radio/headset/distress/som + w_uniform = /obj/item/clothing/under/som/webbing + shoes = /obj/item/clothing/shoes/marine/som/knife + wear_suit = /obj/item/clothing/suit/modular/som + gloves = /obj/item/clothing/gloves/marine/som + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/som + r_pocket = /obj/item/storage/pouch/firstaid/som/full + l_pocket = /obj/item/storage/pouch/grenade/som/ert + back = /obj/item/storage/backpack/lightpack/som + +/datum/outfit/job/som/ert/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + +/datum/outfit/job/som/ert/standard/standard_assaultrifle + suit_store = /obj/item/weapon/gun/rifle/som/mag_harness + belt = /obj/item/storage/belt/marine/som/som_rifle + +/datum/outfit/job/som/ert/standard/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/standard/standard_smg + suit_store = /obj/item/weapon/gun/smg/som/support + belt = /obj/item/storage/belt/marine/som/som_smg + +/datum/outfit/job/som/ert/standard/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/standard/standard_shotgun + back = /obj/item/storage/backpack/satchel/som + belt = /obj/item/storage/belt/shotgun/som/mixed + wear_suit = /obj/item/clothing/suit/modular/som/light/shield + suit_store = /obj/item/weapon/gun/shotgun/som/standard + +/datum/outfit/job/som/ert/standard/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/standard/charger + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/magharness + belt = /obj/item/storage/belt/marine/som/volkite + +/datum/outfit/job/som/ert/standard/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +//Base SOM medic outfit +/datum/outfit/job/som/ert/medic + name = "SOM Medic" + jobtype = /datum/job/som/ert/medic + + belt = /obj/item/storage/belt/lifesaver/som/quick + ears = /obj/item/radio/headset/distress/som + w_uniform = /obj/item/clothing/under/som/medic/vest + shoes = /obj/item/clothing/shoes/marine/som/knife + wear_suit = /obj/item/clothing/suit/modular/som + gloves = /obj/item/clothing/gloves/marine/som + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/som + glasses = /obj/item/clothing/glasses/hud/health + r_pocket = /obj/item/storage/pouch/magazine/large/som + l_pocket = /obj/item/storage/pouch/grenade/som/ert + back = /obj/item/storage/backpack/lightpack/som + +/datum/outfit/job/som/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/medic/standard_assaultrifle + suit_store = /obj/item/weapon/gun/rifle/som/mag_harness + +/datum/outfit/job/som/ert/medic/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/ert/medic/standard_smg + suit_store = /obj/item/weapon/gun/smg/som/support + +/datum/outfit/job/som/ert/medic/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/ert/medic/standard_shotgun + r_pocket = /obj/item/storage/pouch/shotgun/som + suit_store = /obj/item/weapon/gun/shotgun/som/support + +/datum/outfit/job/som/ert/medic/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + +//Base SOM veteran outfit +/datum/outfit/job/som/ert/veteran + name = "SOM Veteran" + jobtype = /datum/job/som/ert/veteran + + belt = /obj/item/storage/belt/marine/som/volkite + ears = /obj/item/radio/headset/distress/som + w_uniform = /obj/item/clothing/under/som/veteran/webbing + shoes = /obj/item/clothing/shoes/marine/som/knife + wear_suit = /obj/item/clothing/suit/modular/som/heavy + gloves = /obj/item/clothing/gloves/marine/som/veteran + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/som/veteran + glasses = /obj/item/clothing/glasses/meson + r_pocket = /obj/item/storage/pouch/firstaid/som/full + l_pocket = /obj/item/storage/pouch/grenade/som/ert + back = /obj/item/storage/backpack/lightpack/som + +/datum/outfit/job/som/ert/veteran/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + +/datum/outfit/job/som/ert/veteran/charger + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet + +/datum/outfit/job/som/ert/veteran/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/breacher_vet + head = /obj/item/clothing/head/modular/som/lorica + glasses = /obj/item/clothing/glasses/welding + wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet + l_hand = /obj/item/weapon/shield/riot/marine/som + +/datum/outfit/job/som/ert/veteran/breacher_vet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/caliver + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet + +/datum/outfit/job/som/ert/veteran/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/caliver_pack + belt = /obj/item/storage/belt/grenade/som + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet + l_pocket = /obj/item/storage/pouch/pistol/som + back = /obj/item/cell/lasgun/volkite/powerpack + +/datum/outfit/job/som/ert/veteran/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_L_POUCH) + +/datum/outfit/job/som/ert/veteran/culverin + belt = /obj/item/weapon/gun/shotgun/double/sawn + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness + back = /obj/item/cell/lasgun/volkite/powerpack + +/datum/outfit/job/som/ert/veteran/culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/rpg + head = /obj/item/clothing/head/modular/som/bio + wear_suit = /obj/item/clothing/suit/modular/som/heavy/mithridatius + suit_store = /obj/item/weapon/gun/smg/som/support + belt = /obj/item/storage/belt/marine/som + back = /obj/item/storage/holster/backholster/rpg/som/ert + l_pocket = /obj/item/storage/pouch/grenade/som + +/datum/outfit/job/som/ert/veteran/rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/pyro + head = /obj/item/clothing/head/modular/som/hades + wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro + belt = /obj/item/storage/holster/belt/pistol/m4a3/som + back = /obj/item/ammo_magazine/flamer_tank/backtank + suit_store = /obj/item/weapon/gun/flamer/som/mag_harness + +/datum/outfit/job/som/ert/veteran/pyro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) + + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_SUIT) + +/datum/outfit/job/som/ert/veteran/shotgunner + belt = /obj/item/storage/belt/shotgun/som/flechette + wear_suit = /obj/item/clothing/suit/modular/som/light/shield + suit_store = /obj/item/weapon/gun/shotgun/som/burst/ert + +/datum/outfit/job/som/ert/veteran/shotgunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + +//Base SOM leader outfit +/datum/outfit/job/som/ert/leader + name = "SOM Leader" + jobtype = /datum/job/som/ert/leader + + belt = /obj/item/storage/belt/marine/som/volkite + ears = /obj/item/radio/headset/distress/som + w_uniform = /obj/item/clothing/under/som/leader/webbing + shoes = /obj/item/clothing/shoes/marine/som/knife + wear_suit = /obj/item/clothing/suit/modular/som/heavy/leader/valk + gloves = /obj/item/clothing/gloves/marine/som/veteran + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/som/leader + glasses = /obj/item/clothing/glasses/hud/health + r_pocket = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + l_pocket = /obj/item/storage/pouch/grenade/som/ert + back = /obj/item/storage/backpack/lightpack/som + +/datum/outfit/job/som/ert/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + +/datum/outfit/job/som/ert/leader/standard_assaultrifle + suit_store = /obj/item/weapon/gun/rifle/som/veteran + belt = /obj/item/storage/belt/marine/som/som_rifle_ap + +/datum/outfit/job/som/ert/leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/leader/charger + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet + +/datum/outfit/job/som/ert/leader/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/leader/caliver + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet + +/datum/outfit/job/som/ert/leader/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/leader/caliver_pack + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor + belt = /obj/item/belt_harness + back = /obj/item/cell/lasgun/volkite/powerpack + +/datum/outfit/job/som/ert/leader/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/breacher_melee + head = /obj/item/clothing/head/modular/som/lorica + wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica + suit_store = /obj/item/weapon/twohanded/fireaxe/som + belt = /obj/item/storage/holster/belt/pistol/m4a3/som + +/datum/outfit/job/som/ert/veteran/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/breacher_rpg + head = /obj/item/clothing/head/modular/som/lorica + wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica + suit_store = /obj/item/weapon/twohanded/fireaxe/som + belt = /obj/item/storage/belt/grenade/som + back = /obj/item/storage/holster/backholster/rpg/som/ert + l_pocket = /obj/item/storage/pouch/explosive/som + +/datum/outfit/job/som/ert/veteran/breacher_rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/thermobaric, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/thermobaric, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/heat, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/rad, SLOT_IN_L_POUCH) + +/datum/outfit/job/som/ert/veteran/breacher_flamer + head = /obj/item/clothing/head/modular/som/hades + wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro + suit_store = /obj/item/weapon/twohanded/fireaxe/som + belt = /obj/item/storage/belt/sparepouch/som + back = /obj/item/weapon/gun/flamer/som/mag_harness + +/datum/outfit/job/som/ert/veteran/breacher_flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/veteran/breacher_culverin + head = /obj/item/clothing/head/modular/som/lorica + wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica + belt = /obj/item/weapon/gun/shotgun/double/sawn + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness + back = /obj/item/cell/lasgun/volkite/powerpack + +/datum/outfit/job/som/ert/veteran/breacher_culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/medic/breacher + head = /obj/item/clothing/head/modular/som/lorica + wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet + l_hand = /obj/item/weapon/shield/riot/marine/som + +/datum/outfit/job/som/ert/medic/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/russian_red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/ert/leader/breacher_melee + suit_store = /obj/item/weapon/twohanded/fireaxe/som + belt = /obj/item/storage/holster/belt/pistol/m4a3/som + +/datum/outfit/job/som/ert/leader/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) + + H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + +/datum/outfit/job/som/ert/leader/breacher_ranged + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet + l_hand = /obj/item/weapon/shield/riot/marine/som + +/datum/outfit/job/som/ert/leader/breacher_ranged/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new/obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) diff --git a/code/datums/outfits/som_shipside.dm b/code/datums/outfits/som_shipside.dm new file mode 100644 index 0000000000000..4a5a9ca8f5058 --- /dev/null +++ b/code/datums/outfits/som_shipside.dm @@ -0,0 +1,167 @@ +/datum/outfit/job/som/command/commander + name = SOM_COMMANDER + jobtype = /datum/job/som/command/commander + + id = /obj/item/card/id/gold + +/datum/outfit/job/som/command/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/command/fieldcommander + name = SOM_FIELD_COMMANDER + jobtype = /datum/job/som/command/fieldcommander + + id = /obj/item/card/id/dogtag/fc + +/datum/outfit/job/som/command/staffofficer + name = SOM_STAFF_OFFICER + jobtype = /datum/job/som/command/staffofficer + + id = /obj/item/card/id/silver + +/datum/outfit/job/som/command/pilot + name = SOM_PILOT_OFFICER + jobtype = /datum/job/som/command/pilot + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70 + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/pilot + wear_suit = /obj/item/clothing/suit/storage/marine/pilot + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/insulated + glasses = /obj/item/clothing/glasses/sunglasses/aviator + head = /obj/item/clothing/head/helmet/marine/pilot + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/hud_tablet/pilot + +/datum/outfit/job/som/command/mech_pilot + name = SOM_MECH_PILOT + jobtype = /datum/job/som/command/mech_pilot + + id = /obj/item/card/id/dogtag + belt = /obj/item/storage/belt/utility/full + glasses = /obj/item/clothing/glasses/welding + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/mech + wear_suit = /obj/item/clothing/suit/storage/marine/mech_pilot + head = /obj/item/clothing/head/helmet/marine/mech_pilot + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine + +/datum/outfit/job/som/engineering/chief + name = SOM_CHIEF_ENGINEER + jobtype = /datum/job/som/engineering/chief + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/ce + wear_suit = /obj/item/clothing/suit/storage/marine/officer/req + shoes = /obj/item/clothing/shoes/marine/full + glasses = /obj/item/clothing/glasses/welding/superior + gloves = /obj/item/clothing/gloves/insulated + head = /obj/item/clothing/head/beret/marine/techofficer + r_pocket = /obj/item/storage/pouch/construction + back = /obj/item/storage/backpack/marine/engineerpack + +/datum/outfit/job/som/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + +/datum/outfit/job/som/engineering/tech + name = SOM_TECH + jobtype = /datum/job/som/engineering/tech + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/st + w_uniform = /obj/item/clothing/under/marine/officer/engi + wear_suit = /obj/item/clothing/suit/storage/marine/ship_tech + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/insulated + glasses = /obj/item/clothing/glasses/welding/flipped + head = /obj/item/clothing/head/tgmccap/req + r_pocket = /obj/item/storage/pouch/general/medium + back = /obj/item/storage/backpack/marine/engineerpack + +/datum/outfit/job/som/requisitions/officer + name = SOM_REQUISITIONS_OFFICER + jobtype = /datum/job/som/requisitions/officer + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/m44/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/ro_suit + wear_suit = /obj/item/clothing/suit/storage/marine/officer/req + suit_store = /obj/item/weapon/gun/energy/taser + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/insulated + head = /obj/item/clothing/head/tgmccap/req + r_pocket = /obj/item/storage/pouch/general/large + +/datum/outfit/job/som/medical/professor + name = SOM_CHIEF_MEDICAL_OFFICER + jobtype = /datum/job/som/medical/professor + + id = /obj/item/card/id + belt = /obj/item/storage/belt/rig/medical + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/rank/medical/blue + wear_suit = /obj/item/clothing/suit/storage/labcoat/cmo + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + head = /obj/item/clothing/head/cmo + r_pocket = /obj/item/storage/pouch/medkit/doctor + l_pocket = /obj/item/storage/pouch/surgery + +/datum/outfit/job/som/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/medical/medicalofficer + name = SOM_MEDICAL_DOCTOR + jobtype = /datum/job/som/medical/medicalofficer + + id = /obj/item/card/id + belt = /obj/item/storage/belt/rig/medical + ears = /obj/item/radio/headset/mainship/doc + w_uniform = /obj/item/clothing/under/rank/medical/purple + wear_suit = /obj/item/clothing/suit/storage/labcoat + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + head = /obj/item/clothing/head/surgery/purple + +/datum/outfit/job/som/medical/medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) + +/datum/outfit/job/som/civilian/chef + name = SOM_CHEF + jobtype = /datum/job/som/civilian/chef + + id = /obj/item/card/id + belt = /obj/item/storage/belt/rig/medical + ears = /obj/item/radio/headset/mainship/doc + w_uniform = /obj/item/clothing/under/rank/medical/purple + wear_suit = /obj/item/clothing/suit/storage/labcoat + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + head = /obj/item/clothing/head/surgery/purple + +/datum/outfit/job/som/civilian/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) diff --git a/code/datums/outfits/special_forces.dm b/code/datums/outfits/special_forces.dm new file mode 100644 index 0000000000000..75d570e61cf6a --- /dev/null +++ b/code/datums/outfits/special_forces.dm @@ -0,0 +1,250 @@ +/datum/outfit/job/special_forces/standard + name = "Special Response Force Standard" + jobtype = /datum/job/special_forces/standard + + glasses = /obj/item/clothing/glasses/night + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/dutch + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops + shoes = /obj/item/clothing/shoes/combat + wear_suit = /obj/item/clothing/suit/storage/marine/specops + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/modular/m10x + suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/special_forces/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + +/datum/outfit/job/special_forces/breacher + name = "Special Response Force Breacher" + jobtype = /datum/job/special_forces/breacher + + glasses = /obj/item/clothing/glasses/night + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/dutch + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops + shoes = /obj/item/clothing/shoes/combat + wear_suit = /obj/item/clothing/suit/storage/marine/specops/support + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/modular/m10x + suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed/breacher + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/medkit/firstaid + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/special_forces/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/metal, SLOT_R_HAND) + +/datum/outfit/job/special_forces/drone_operator + name = "Special Response Force Drone Operator" + jobtype = /datum/job/special_forces/drone_operator + + glasses = /obj/item/clothing/glasses/night + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/dutch + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops + shoes = /obj/item/clothing/shoes/combat + wear_suit = /obj/item/clothing/suit/storage/marine/specops/support + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/modular/m10x/welding + suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed + r_pocket = /obj/item/storage/pouch/grenade + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/special_forces/drone_operator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/box11x35mm, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/box11x35mm, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/uav_turret, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/deployable_vehicle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/unmanned_vehicle_remote, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + +/datum/outfit/job/special_forces/medic + name = "Special Response Force Medic" + jobtype = /datum/job/special_forces/medic + + glasses = /obj/item/clothing/glasses/night + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/marine/specops + belt = /obj/item/storage/belt/lifesaver/full + wear_suit = /obj/item/clothing/suit/storage/marine/specops/medic + head = /obj/item/clothing/head/modular/m10x + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed + r_pocket = /obj/item/storage/pouch/medical_injectors/medic + l_pocket = /obj/item/storage/pouch/magazine/large + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/special_forces/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + +/datum/outfit/job/special_forces/leader + name = "Special Response Force Leader" + jobtype = /datum/job/special_forces/leader + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/distress/dutch + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops + glasses = /obj/item/clothing/glasses/night + shoes = /obj/item/clothing/shoes/combat + wear_suit = /obj/item/clothing/suit/storage/marine/specops/leader + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/beret/sec + suit_store = /obj/item/weapon/gun/rifle/m16/spec_op + r_pocket = /obj/item/storage/pouch/shotgun + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/special_forces/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/defibrillator/civi, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/incendiary, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/incendiary, SLOT_IN_R_POUCH) diff --git a/code/datums/outfits/survivor.dm b/code/datums/outfits/survivor.dm new file mode 100644 index 0000000000000..c015beb0500ec --- /dev/null +++ b/code/datums/outfits/survivor.dm @@ -0,0 +1,316 @@ +//Assistant +/datum/job/survivor/assistant + title = "Assistant Survivor" + outfit = /datum/outfit/job/survivor/assistant + + +/datum/outfit/job/survivor/assistant + name = "Assistant Survivor" + jobtype = /datum/job/survivor/assistant + + w_uniform = /obj/item/clothing/under/color/grey + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/norm + wear_suit = /obj/item/clothing/suit/armor/vest + ears = /obj/item/radio/survivor + mask = /obj/item/clothing/mask/gas/tactical/coif + head = /obj/item/clothing/head/welding/flipped + belt = /obj/item/storage/belt/utility/full + l_pocket = /obj/item/flashlight/combat + r_hand = /obj/item/weapon/combat_knife + +/datum/outfit/job/survivor/scientist + name = "Scientist Survivor" + jobtype = /datum/job/survivor/scientist + + w_uniform = /obj/item/clothing/under/rank/scientist + wear_suit = /obj/item/clothing/suit/storage/labcoat/researcher + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/toxins + ears = /obj/item/radio/survivor + l_hand = /obj/item/storage/firstaid/adv + l_pocket = /obj/item/storage/pouch/surgery + r_pocket = /obj/item/flashlight/combat + +/datum/outfit/job/survivor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/polyhexanide, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + +/datum/outfit/job/survivor/doctor + name = "Doctor's Assistant Survivor" + jobtype = /datum/job/survivor/doctor + + w_uniform = /obj/item/clothing/under/rank/medical/blue + wear_suit = /obj/item/clothing/suit/storage/labcoat + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/med + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + r_pocket = /obj/item/storage/pouch/surgery + belt = /obj/item/storage/belt/rig + mask = /obj/item/clothing/mask/surgical + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/doctor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/bicaridine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/kelotane, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/tramadol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/tricordrazine, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/dylovene, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/isotonic, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/inaprovaline, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_R_POUCH) + +/datum/outfit/job/survivor/liaison + name = "Liaison Survivor" + jobtype = /datum/job/survivor/liaison + + w_uniform = /obj/item/clothing/under/liaison_suit + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/norm + ears = /obj/item/radio/survivor + belt = /obj/item/storage/holster/belt/pistol/m4a3/vp78 + l_hand = /obj/item/flashlight/combat + l_pocket = /obj/item/tool/crowbar + +/datum/outfit/job/survivor/security + name = "Security Guard Survivor" + jobtype = /datum/job/survivor/security + + w_uniform = /obj/item/clothing/under/rank/security + wear_suit = /obj/item/clothing/suit/armor/patrol + head = /obj/item/clothing/head/securitycap + shoes = /obj/item/clothing/shoes/marine + back = /obj/item/storage/backpack/security + belt = /obj/item/storage/belt/security + gloves = /obj/item/clothing/gloves/black + suit_store = /obj/item/weapon/gun/pistol/g22 + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/flashlight/combat, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + + +/datum/outfit/job/survivor/civilian + name = "Civilian Survivor" + jobtype = /datum/job/survivor/civilian + + w_uniform = /obj/item/clothing/under/colonist + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/norm + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/civilian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BACKPACK) + + +/datum/outfit/job/survivor/chef + name = "Chef Survivor" + jobtype = /datum/job/survivor/chef + + w_uniform = /obj/item/clothing/under/rank/chef + wear_suit = /obj/item/clothing/suit/storage/chef + head = /obj/item/clothing/head/chefhat + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/crazy, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/soup/mysterysoup, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/packaged_hdogs, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/organ, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/chocolateegg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/meat/xeno, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/pastries/xemeatpie, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/pastries/birthdaycakeslice, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/donut/meat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + + +/datum/outfit/job/survivor/botanist + name = "Botanist Survivor" + jobtype = /datum/job/survivor/botanist + + w_uniform = /obj/item/clothing/under/rank/hydroponics + wear_suit = /obj/item/clothing/suit/storage/apron/overalls + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/hydroponics + ears = /obj/item/radio/survivor + suit_store = /obj/item/weapon/combat_knife + l_pocket = /obj/item/flashlight + r_pocket = /obj/item/tool/crowbar + +/datum/outfit/job/survivor/botanist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, SLOT_IN_BACKPACK) + + +/datum/outfit/job/survivor/atmos + name = "Atmospherics Technician Survivor" + jobtype = /datum/job/survivor/atmos + + w_uniform = /obj/item/clothing/under/rank/atmospheric_technician + wear_suit = /obj/item/clothing/suit/storage/hazardvest + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/som + gloves = /obj/item/clothing/gloves/insulated + belt = /obj/item/storage/belt + head = /obj/item/clothing/head/hardhat/white + glasses = /obj/item/clothing/glasses/welding + r_pocket = /obj/item/storage/pouch/electronics/full + l_pocket = /obj/item/storage/pouch/construction + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/multitool, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/lightreplacer, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/deployable_floodlight, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_L_POUCH) + + +/datum/outfit/job/survivor/chaplain + name = "Chaplain Survivor" + jobtype = /datum/job/survivor/chaplain + + w_uniform = /obj/item/clothing/under/rank/chaplain + wear_suit = /obj/item/clothing/suit/armor/vest + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/norm + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/lighter, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/bible, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + +/datum/outfit/job/survivor/miner + name = "Miner Survivor" + jobtype = /datum/job/survivor/miner + + w_uniform = /obj/item/clothing/under/rank/miner + head = /obj/item/clothing/head/helmet/space/rig/mining + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/som + l_hand = /obj/item/weapon/twohanded/sledgehammer + r_pocket = /obj/item/reagent_containers/cup/glass/flask + r_hand = /obj/item/clothing/suit/space/rig/mining + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/miner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/lighter, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/whiskey, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + + +/datum/outfit/job/survivor/salesman + name = "Salesman Survivor" + jobtype = /datum/job/survivor/salesman + + w_uniform = /obj/item/clothing/under/lawyer/purpsuit + wear_suit = /obj/item/clothing/suit/storage/lawyer/purpjacket + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel + mask = /obj/item/clothing/mask/cigarette/pipe/bonepipe + glasses = /obj/item/clothing/glasses/sunglasses/aviator + ears = /obj/item/radio/survivor + +/datum/outfit/job/survivor/salesman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + + +/datum/outfit/job/survivor/marshal + name = "Colonial Marshal Survivor" + jobtype = /datum/job/survivor/marshal + + w_uniform = /obj/item/clothing/under/CM_uniform + wear_suit = /obj/item/clothing/suit/storage/CMB + shoes = /obj/item/clothing/shoes/jackboots + back = /obj/item/storage/backpack/satchel/sec + suit_store = /obj/item/storage/holster/belt/m44/full + belt = /obj/item/storage/belt/sparepouch + gloves = /obj/item/clothing/gloves/ruggedgloves + l_pocket = /obj/item/flashlight/combat + ears = /obj/item/radio/survivor + head = /obj/item/clothing/head/slouch + +/datum/outfit/job/survivor/marshal/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/restraints/handcuffs, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BELT) + + +/datum/outfit/job/survivor/rambo + name = "Overpowered Survivor" + jobtype = /datum/job/survivor/rambo + w_uniform = /obj/item/clothing/under/marine/striped + wear_suit = /obj/item/clothing/suit/armor/patrol + shoes = /obj/item/clothing/shoes/marine/clf/full + back = /obj/item/storage/holster/blade/machete/full + gloves = /obj/item/clothing/gloves/ruggedgloves + suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer + belt = /obj/item/storage/belt/marine/alf_machinecarbine + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + r_pocket = /obj/item/flashlight/combat + glasses = /obj/item/clothing/glasses/m42_goggles + head = /obj/item/clothing/head/headband + ears = /obj/item/radio/survivor diff --git a/code/datums/outfits/upp.dm b/code/datums/outfits/upp.dm new file mode 100644 index 0000000000000..c50c94bd172da --- /dev/null +++ b/code/datums/outfits/upp.dm @@ -0,0 +1,199 @@ +/datum/outfit/job/upp/standard + name = "USL Gunner" + jobtype = /datum/job/upp/standard + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine/upp/full + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/UPP + mask = /obj/item/clothing/mask/gas/pmc/leader + suit_store = /obj/item/weapon/gun/rifle/type71 + r_pocket = /obj/item/storage/pouch/pistol + l_pocket = /obj/item/storage/pouch/magazine/pistol/large + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/upp/standard/hvh + name = "USL Gunner (HvH)" + + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/hvh + + +/datum/outfit/job/upp/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tramadol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/c99, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + + +/datum/outfit/job/upp/medic + name = "USL Surgeon" + jobtype = /datum/job/upp/medic + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/lifesaver/full/upp + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP/medic + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/uppcap + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/smg/skorpion + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/general/large + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/upp/medic/hvh + name = "USL Surgeon (HvH)" + + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/hvh + + +/datum/outfit/job/upp/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + + +/datum/outfit/job/upp/heavy + name = "USL Powder Monkey" + jobtype = /datum/job/upp/heavy + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine/upp/full + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/UPP/heavy + suit_store = /obj/item/weapon/gun/rifle/type71/flamer + r_pocket = /obj/item/storage/pouch/explosive + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/upp/heavy/hvh + name = "USL Powder Monkey (HvH)" + + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh + + +/datum/outfit/job/upp/heavy/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + + +/datum/outfit/job/upp/leader + name = "USL Captain" + jobtype = /datum/job/upp/leader + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/korovin/standard + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/uppcap/beret + suit_store = /obj/item/weapon/gun/rifle/type71 + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/upp/leader/hvh + name = "USL Captain (HvH)" + + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh + + +/datum/outfit/job/upp/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) diff --git a/code/datums/outfits/upp_commando.dm b/code/datums/outfits/upp_commando.dm new file mode 100644 index 0000000000000..8f1fe1ba5f1a3 --- /dev/null +++ b/code/datums/outfits/upp_commando.dm @@ -0,0 +1,140 @@ + +/datum/outfit/job/upp/commando/standard + name = "USL Elite Powder Monkey" + jobtype = /datum/job/upp/commando/standard + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/marine/upp/full + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/commando + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/uppcap + mask = /obj/item/clothing/mask/gas/pmc/upp + glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp + suit_store = /obj/item/weapon/gun/rifle/type71/commando + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + implants = list(/obj/item/implant/suicide_dust) + + +/datum/outfit/job/upp/commando/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/restraints/handcuffs, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/chloralhydrate, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/sleeptoxin, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + + +/datum/outfit/job/upp/commando/medic + name = "USL Elite Surgeon" + jobtype = /datum/job/upp/commando/medic + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/lifesaver/full/upp + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP/medic + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/commando + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/uppcap + mask = /obj/item/clothing/mask/gas/pmc/upp + glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp + suit_store = /obj/item/weapon/gun/smg/skorpion + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/general/large + back = /obj/item/storage/backpack/lightpack + implants = list(/obj/item/implant/suicide_dust) + + +/datum/outfit/job/upp/commando/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/attachable/suppressor, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/attachable/reddot, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + + +/datum/outfit/job/upp/commando/leader + name = "USL Elite Captain" + jobtype = /datum/job/upp/commando/leader + + id = /obj/item/card/id/silver + belt = /obj/item/storage/holster/belt/korovin/tranq + ears = /obj/item/radio/headset/distress/usl + w_uniform = /obj/item/clothing/under/marine/veteran/UPP + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/commando + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/uppcap/beret + mask = /obj/item/clothing/mask/gas/pmc/upp + glasses = /obj/item/clothing/glasses/night/m42_night_goggles/upp + suit_store = /obj/item/weapon/gun/rifle/type71/commando + r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack + implants = list(/obj/item/implant/suicide_dust) + + +/datum/outfit/job/upp/commando/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) + + H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) diff --git a/code/datums/outfits/vsd.dm b/code/datums/outfits/vsd.dm new file mode 100644 index 0000000000000..d5d9b1816bbfd --- /dev/null +++ b/code/datums/outfits/vsd.dm @@ -0,0 +1,715 @@ + +//outfits +/datum/outfit/job/vsd/standard + name = "VSD Standard" + jobtype = /datum/job/vsd/standard + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + glasses = /obj/item/clothing/glasses/night/vsd + w_uniform = /obj/item/clothing/under/vsd/webbing + shoes = /obj/item/clothing/shoes/marine/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/vsd + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine + back = /obj/item/storage/backpack/lightpack/vsd + belt = /obj/item/storage/holster/belt/pistol/standard_pistol + +/datum/outfit/job/vsd/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + +/datum/outfit/job/vsd/standard/grunt_one + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert + head = /obj/item/clothing/head/helmet/marine/vsd/secondary + suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard + mask = /obj/item/clothing/mask/gas/vsd + +/datum/outfit/job/vsd/standard/grunt_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) + +/datum/outfit/job/vsd/standard/ksg + w_uniform = /obj/item/clothing/under/vsd/shirt/webbing + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert + suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/standard + l_pocket = /obj/item/storage/pouch/shotgun + +/datum/outfit/job/vsd/standard/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + +/datum/outfit/job/vsd/standard/grunt_second + suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard + head = /obj/item/clothing/head/vsd + +/datum/outfit/job/vsd/standard/grunt_second/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + +/datum/outfit/job/vsd/standard/grunt_third + suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard + +/datum/outfit/job/vsd/standard/grunt_third/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + + +//outfits +/datum/outfit/job/vsd/engineer + name = "VSD Engineer" + jobtype = /datum/job/vsd/engineer + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + glasses = /obj/item/clothing/glasses/meson + w_uniform = /obj/item/clothing/under/vsd/webbing + shoes = /obj/item/clothing/shoes/marine/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/desert + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/vsd/secondary + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine + back = /obj/item/storage/backpack/lightpack/vsd + belt = /obj/item/storage/belt/utility/full + +/datum/outfit/job/vsd/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + +/datum/outfit/job/vsd/engineer/l26 + suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/engineer + +/datum/outfit/job/vsd/engineer/l26/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/attachable/buildasentry, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_ACCESSORY) + +/datum/outfit/job/vsd/engineer/vsd_rifle + suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor + head = /obj/item/clothing/head/vsd + +/datum/outfit/job/vsd/engineer/vsd_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_ACCESSORY) + + +//outfits +/datum/outfit/job/vsd/medic + name = "VSD Medic" + jobtype = /datum/job/vsd/medic + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + belt = /obj/item/storage/belt/lifesaver/full/upp + glasses = /obj/item/clothing/glasses/hud/health + w_uniform = /obj/item/clothing/under/vsd/medic + shoes = /obj/item/clothing/shoes/marine/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/vsd/medic + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine + back = /obj/item/storage/backpack/lightpack/vsd + +/datum/outfit/job/vsd/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + +/datum/outfit/job/vsd/medic/ksg + suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/support + l_pocket = /obj/item/storage/pouch/shotgun + +/datum/outfit/job/vsd/medic/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_SUIT) + + +/datum/outfit/job/vsd/medic/vsd_rifle + suit_store = /obj/item/weapon/gun/rifle/vsd_rifle + +/datum/outfit/job/vsd/medic/vsd_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) + +/datum/outfit/job/vsd/medic/vsd_pdw + suit_store = /obj/item/weapon/gun/smg/vsd_pdw/medic + +/datum/outfit/job/vsd/medic/vsd_pdw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_SUIT) + + +//outfits +/datum/outfit/job/vsd/spec + name = "VSD Specialist" + jobtype = /datum/job/vsd/spec + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + glasses = /obj/item/clothing/glasses/night/vsd + w_uniform = /obj/item/clothing/under/vsd/webbing + shoes = /obj/item/clothing/shoes/marine/vsd + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack/vsd + belt = /obj/item/storage/holster/belt/pistol/standard_pistol + +/datum/outfit/job/vsd/spec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + + +/datum/outfit/job/vsd/spec/flamer + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor + head = /obj/item/clothing/head/helmet/marine/vsd/pyro + belt = /obj/item/belt_harness/marine + suit_store = /obj/item/weapon/gun/flamer/big_flamer/vsd + back = /obj/item/ammo_magazine/flamer_tank/backtank/X + w_uniform = /obj/item/clothing/under/vsd/shirt/webbing + l_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/vsd/spec/flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large, SLOT_IN_SUIT) + +/datum/outfit/job/vsd/spec/demolitionist + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor + head = /obj/item/clothing/head/helmet/marine/vsd + belt = /obj/item/belt_harness/marine + glasses = /obj/item/clothing/glasses/meson + suit_store = /obj/item/weapon/gun/launcher/rocket/vsd + l_pocket = /obj/item/storage/pouch/explosive + +/datum/outfit/job/vsd/spec/demolitionist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + +/datum/outfit/job/vsd/spec/gunslinger + wear_suit = /obj/item/clothing/suit/storage/marine/vsd + head = /obj/item/clothing/head/helmet/marine/vsd/secondary + belt = /obj/item/storage/holster/belt/korovin + w_uniform = /obj/item/clothing/under/vsd/shirt/webbing + +/datum/outfit/job/vsd/spec/gunslinger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/xmdivider/gunslinger(H), SLOT_IN_BELT) + +/datum/outfit/job/vsd/spec/uslspec_one + w_uniform = /obj/item/clothing/under/vsd/upp + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/upp + head = /obj/item/clothing/head/helmet/marine/vsd/upp + mask = /obj/item/clothing/mask/gas/vsd + suit_store = /obj/item/weapon/gun/rifle/type71/flamer + l_pocket = /obj/item/storage/pouch/magazine + +/datum/outfit/job/vsd/spec/uslspec_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + +/datum/outfit/job/vsd/spec/uslspec_two + w_uniform = /obj/item/clothing/under/vsd/upp + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/upp + head = /obj/item/clothing/head/uppcap/beret + glasses = /obj/item/clothing/glasses/sunglasses/fake + mask = /obj/item/clothing/mask/gas/vsd + suit_store = /obj/item/weapon/gun/clf_heavyrifle + back = /obj/item/shotgunbox/clf_heavyrifle + l_pocket = /obj/item/storage/pouch/grenade + +/datum/outfit/job/vsd/spec/uslspec_two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + + +//juggernaut outfits +/datum/outfit/job/vsd/juggernaut + name = "VSD Juggernaut" + jobtype = /datum/job/vsd/juggernaut + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + glasses = /obj/item/clothing/glasses/meson + w_uniform = /obj/item/clothing/under/vsd/webbing + shoes = /obj/item/clothing/shoes/marine/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/juggernaut + suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/vsd/juggernaut + mask = /obj/item/clothing/mask/gas/vsd + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine + back = /obj/item/storage/backpack/lightpack/vsd + +/datum/outfit/job/vsd/juggernaut/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + +/datum/outfit/job/vsd/eod + name = "VSD Juggernaut" + jobtype = /datum/job/vsd/juggernaut + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + glasses = /obj/item/clothing/glasses/meson + w_uniform = /obj/item/clothing/under/vsd/webbing + shoes = /obj/item/clothing/shoes/marine/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/eod + suit_store = /obj/item/weapon/gun/launcher/rocket/vsd + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + head = /obj/item/clothing/head/helmet/marine/vsd/eod + belt = /obj/item/belt_harness/marine + mask = /obj/item/clothing/mask/gas/vsd + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/explosive + back = /obj/item/storage/backpack/lightpack/vsd + +/datum/outfit/job/vsd/eod/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_L_POUCH) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/chemical, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/chemical, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + + +//SL outfits +/datum/outfit/job/vsd/leader + name = "VSD Squad Leader" + jobtype = /datum/job/vsd/leader + + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/vsd + w_uniform = /obj/item/clothing/under/vsd/webbing + shoes = /obj/item/clothing/shoes/marine/vsd + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + l_pocket = /obj/item/storage/pouch/magazine + back = /obj/item/storage/backpack/lightpack/vsd + +/datum/outfit/job/vsd/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + + +/datum/outfit/job/vsd/leader/one + head = /obj/item/clothing/head/vsd/beret + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert + mask = /obj/item/clothing/mask/gas/vsd + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard + belt = /obj/item/storage/holster/belt/pistol/standard_pistol + +/datum/outfit/job/vsd/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + +/datum/outfit/job/vsd/leader/two + head = /obj/item/clothing/head/helmet/marine/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor + mask = /obj/item/clothing/mask/gas/vsd + glasses = /obj/item/clothing/glasses/night/vsd + suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut + belt = /obj/item/storage/holster/belt/korovin + +/datum/outfit/job/vsd/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/xmdivider/gunslinger(H), SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + +/datum/outfit/job/vsd/leader/upp_three + head = /obj/item/clothing/head/uppcap/beret + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor/upp + mask = /obj/item/clothing/mask/gas/vsd + glasses = /obj/item/clothing/glasses/night/vsd + suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut + belt = /obj/item/storage/holster/belt/pistol/standard_pistol + +/datum/outfit/job/vsd/leader/upp_three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) diff --git a/code/modules/clothing/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm similarity index 100% rename from code/modules/clothing/outfits/vv_outfit.dm rename to code/datums/outfits/vv_outfit.dm diff --git a/tgmc.dme b/tgmc.dme index 6d288ae693527..ee77620a28607 100644 --- a/tgmc.dme +++ b/tgmc.dme @@ -389,13 +389,8 @@ #include "code\datums\movement_detector.dm" #include "code\datums\mutable_appearance.dm" #include "code\datums\namepool.dm" -#include "code\datums\outfit.dm" #include "code\datums\personal_statistics.dm" #include "code\datums\progressbar.dm" -#include "code\datums\quick_load_beginners.dm" -#include "code\datums\quick_load_civil_war.dm" -#include "code\datums\quick_load_outfits.dm" -#include "code\datums\quick_load_robots.dm" #include "code\datums\recipe.dm" #include "code\datums\round_statistics.dm" #include "code\datums\saymode.dm" @@ -671,6 +666,36 @@ #include "code\datums\looping_sounds\machinery_sounds.dm" #include "code\datums\looping_sounds\weather_sounds.dm" #include "code\datums\looping_sounds\xeno_sounds.dm" +#include "code\datums\outfits\_outfit.dm" +#include "code\datums\outfits\campaign_asset.dm" +#include "code\datums\outfits\clf.dm" +#include "code\datums\outfits\deathsquad.dm" +#include "code\datums\outfits\erp.dm" +#include "code\datums\outfits\freelancers.dm" +#include "code\datums\outfits\icc.dm" +#include "code\datums\outfits\imperium.dm" +#include "code\datums\outfits\job.dm" +#include "code\datums\outfits\marines.dm" +#include "code\datums\outfits\mercenaries.dm" +#include "code\datums\outfits\misc.dm" +#include "code\datums\outfits\pmc.dm" +#include "code\datums\outfits\quick_load_beginners.dm" +#include "code\datums\outfits\quick_load_civil_war.dm" +#include "code\datums\outfits\quick_load_outfits.dm" +#include "code\datums\outfits\quick_load_robots.dm" +#include "code\datums\outfits\retired.dm" +#include "code\datums\outfits\sectoid.dm" +#include "code\datums\outfits\shipside.dm" +#include "code\datums\outfits\skeleton.dm" +#include "code\datums\outfits\som.dm" +#include "code\datums\outfits\som_ert.dm" +#include "code\datums\outfits\som_shipside.dm" +#include "code\datums\outfits\special_forces.dm" +#include "code\datums\outfits\survivor.dm" +#include "code\datums\outfits\upp.dm" +#include "code\datums\outfits\upp_commando.dm" +#include "code\datums\outfits\vsd.dm" +#include "code\datums\outfits\vv_outfit.dm" #include "code\datums\status_effects\debuffs.dm" #include "code\datums\status_effects\gun_skill.dm" #include "code\datums\status_effects\sectoid.dm" @@ -1486,7 +1511,6 @@ #include "code\modules\clothing\modular_armor\attachments\storage.dm" #include "code\modules\clothing\modular_armor\attachments\uniform.dm" #include "code\modules\clothing\modular_armor\attachments\visors.dm" -#include "code\modules\clothing\outfits\vv_outfit.dm" #include "code\modules\clothing\shoes\colour.dm" #include "code\modules\clothing\shoes\magboots.dm" #include "code\modules\clothing\shoes\marine_shoes.dm" From d6dad4f58863ae9c4a1ea32afef1ba447d1b873e Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Tue, 1 Oct 2024 15:37:37 +0200 Subject: [PATCH 04/17] Outfit refactor --- code/datums/outfits/_outfit.dm | 143 +- code/datums/outfits/campaign_asset.dm | 527 ++-- code/datums/outfits/clf.dm | 476 ++-- code/datums/outfits/deathsquad.dm | 241 +- code/datums/outfits/erp.dm | 171 +- code/datums/outfits/freelancers.dm | 359 ++- code/datums/outfits/icc.dm | 313 +-- code/datums/outfits/imperium.dm | 52 +- code/datums/outfits/pmc.dm | 234 +- code/datums/outfits/quick_load_beginners.dm | 721 +++--- code/datums/outfits/quick_load_civil_war.dm | 14 +- code/datums/outfits/quick_load_outfits.dm | 2439 +++++++++---------- code/datums/outfits/quick_load_robots.dm | 572 +++-- code/datums/outfits/retired.dm | 40 +- code/datums/outfits/sectoid.dm | 14 +- code/datums/outfits/shipside.dm | 51 +- code/datums/outfits/skeleton.dm | 10 +- code/datums/outfits/som_ert.dm | 952 ++++---- code/datums/outfits/som_shipside.dm | 43 +- code/datums/outfits/special_forces.dm | 271 +-- code/datums/outfits/survivor.dm | 214 +- code/datums/outfits/upp.dm | 213 +- code/datums/outfits/upp_commando.dm | 154 +- code/datums/outfits/vsd.dm | 769 +++--- 24 files changed, 4099 insertions(+), 4894 deletions(-) diff --git a/code/datums/outfits/_outfit.dm b/code/datums/outfits/_outfit.dm index 4ecbe2dd98585..d097a08d958fc 100644 --- a/code/datums/outfits/_outfit.dm +++ b/code/datums/outfits/_outfit.dm @@ -85,7 +85,19 @@ var/list/implants ///the species this outfit is designed for var/species = SPECIES_HUMAN + /// A list of all the container contents lists, used to save on copypasta, populated in New() + var/list/container_list = list() +/datum/outfit/New() + . = ..() + container_list += backpack_contents + container_list += belt_contents + container_list += shoe_contents + container_list += suit_contents + container_list += webbing_contents + container_list += head_contents + container_list += r_pocket_contents + container_list += l_pocket_contents /// This gets ran before we equip any items from the variables /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -102,32 +114,32 @@ //Start with uniform,suit,backpack for additional slots if(w_uniform) - equipping_human.equip_to_slot_or_del(new w_uniform(equipping_human), SLOT_W_UNIFORM, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new w_uniform(equipping_human), ITEM_SLOT_ICLOTHING, override_nodrop = TRUE) if(wear_suit) - equipping_human.equip_to_slot_or_del(new wear_suit(equipping_human), SLOT_WEAR_SUIT, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new wear_suit(equipping_human), ITEM_SLOT_OCLOTHING, override_nodrop = TRUE) if(back) - equipping_human.equip_to_slot_or_del(new back(equipping_human), SLOT_BACK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new back(equipping_human), ITEM_SLOT_BACK, override_nodrop = TRUE) if(belt) - equipping_human.equip_to_slot_or_del(new belt(equipping_human), SLOT_BELT, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new belt(equipping_human), ITEM_SLOT_BELT, override_nodrop = TRUE) if(gloves) - equipping_human.equip_to_slot_or_del(new gloves(equipping_human), SLOT_GLOVES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new gloves(equipping_human), ITEM_SLOT_GLOVES, override_nodrop = TRUE) if(shoes) - equipping_human.equip_to_slot_or_del(new shoes(equipping_human), SLOT_SHOES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new shoes(equipping_human), ITEM_SLOT_FEET, override_nodrop = TRUE) if(head) - equipping_human.equip_to_slot_or_del(new head(equipping_human), SLOT_HEAD, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new head(equipping_human), ITEM_SLOT_HEAD, override_nodrop = TRUE) if(mask) - equipping_human.equip_to_slot_or_del(new mask(equipping_human), SLOT_WEAR_MASK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new mask(equipping_human), ITEM_SLOT_MASK, override_nodrop = TRUE) if(ears) if(visualsOnly) - equipping_human.equip_to_slot_or_del(new /obj/item/radio/headset(equipping_human), SLOT_EARS, override_nodrop = TRUE) //We don't want marine cameras. For now they have the same worn_icon_state as the rest. + equipping_human.equip_to_slot_or_del(new /obj/item/radio/headset(equipping_human), ITEM_SLOT_EARS, override_nodrop = TRUE) //We don't want marine cameras. For now they have the same worn_icon_state as the rest. else - equipping_human.equip_to_slot_or_del(new ears(equipping_human), SLOT_EARS, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new ears(equipping_human), ITEM_SLOT_EARS, override_nodrop = TRUE) if(glasses) - equipping_human.equip_to_slot_or_del(new glasses(equipping_human), SLOT_GLASSES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new glasses(equipping_human), ITEM_SLOT_EYES, override_nodrop = TRUE) if(id) - equipping_human.equip_to_slot_or_del(new id(equipping_human), SLOT_WEAR_ID, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new id(equipping_human), ITEM_SLOT_ID, override_nodrop = TRUE) if(suit_store) - equipping_human.equip_to_slot_or_del(new suit_store(equipping_human), SLOT_S_STORE, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new suit_store(equipping_human), ITEM_SLOT_SUITSTORE, override_nodrop = TRUE) if(l_hand) equipping_human.put_in_l_hand(new l_hand(equipping_human)) if(r_hand) @@ -135,89 +147,26 @@ if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - equipping_human.equip_to_slot_or_del(new l_pocket(equipping_human), SLOT_L_STORE, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new l_pocket(equipping_human), ITEM_SLOT_L_POCKET, override_nodrop = TRUE) if(r_pocket) - equipping_human.equip_to_slot_or_del(new r_pocket(equipping_human), SLOT_R_STORE, override_nodrop = TRUE) - // Big todo for the below lists, there should be a unit test that checks if we ever go over capacity of the container - if(backpack_contents) - if(!equipping_human.back) - CRASH("backpack_contents list without a backpack specified in outfit of type [type]!") - for(var/path in backpack_contents) - var/number = backpack_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_BACK, TRUE, TRUE) - if(belt_contents) - if(!equipping_human.belt) - CRASH("belt_contents list without a belt specified in outfit of type [type]!") - for(var/path in belt_contents) - var/number = belt_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_BELT, TRUE, TRUE) - if(shoe_contents) - if(!equipping_human.shoes) - CRASH("shoe_contents list without shoes specified in outfit of type [type]!") - for(var/path in shoe_contents) - var/number = shoe_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_FEET, TRUE, TRUE) - if(suit_contents) - if(!equipping_human.wear_suit) - CRASH("suit_contents list without a suit specified in outfit of type [type]!") - for(var/path in suit_contents) - var/number = suit_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_OCLOTHING, TRUE, TRUE) - if(webbing_contents) - if(!equipping_human.w_uniform) - CRASH("webbing_contents list without a uniform specified in outfit of type [type]!") - for(var/path in webbing_contents) - var/number = webbing_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_ICLOTHING, TRUE, TRUE) - if(head_contents) - if(!equipping_human.head) - CRASH("head_contents list without headwear specified in outfit of type [type]!") - for(var/path in head_contents) - var/number = head_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_HEAD, TRUE, TRUE) - if(r_pocket_contents) - if(!equipping_human.r_pocket) - CRASH("r_pocket_contents list without right pocket container specified in outfit of type [type]!") - for(var/path in r_pocket_contents) - var/number = r_pocket_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_R_POCKET, TRUE, TRUE) - if(l_pocket_contents) - if(!equipping_human.l_pocket) - CRASH("l_pocket_contents list without left pocket container specified in outfit of type [type]!") - for(var/path in l_pocket_contents) - var/number = l_pocket_contents[path] + equipping_human.equip_to_slot_or_del(new r_pocket(equipping_human), ITEM_SLOT_R_POCKET, override_nodrop = TRUE) + + for(var/list/content_list in container_list) // ivan todo make sure to test this + if(!length(content_list)) + continue + for(var/path in content_list) + var/number = content_list[path] if(!isnum(number))//Default to 1 number = 1 for(var/i in 1 to number) - equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_L_POCKET, TRUE, TRUE) + if(!equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_BACK, TRUE, TRUE)) + stack_trace("Failed to place item of type [path] from list [vars["[content_list]"]] in outfit of type [type]!") post_equip(equipping_human, visualsOnly) - if(length(implants)) - for(var/implant_type in implants) - var/obj/item/implant/implanter = new implant_type(equipping_human) - implanter.implant(equipping_human) + for(var/implant_type in implants) + var/obj/item/implant/implanter = new implant_type(equipping_human) + implanter.implant(equipping_human) equipping_human.update_body() return TRUE @@ -243,7 +192,14 @@ .["suit_store"] = suit_store .["r_hand"] = r_hand .["l_hand"] = l_hand - .["backpack_contents"] = backpack_contents // ivan todo implement the other contents lists + .["backpack_contents"] = backpack_contents + .["belt_contents"] = belt_contents + .["shoe_contents"] = shoe_contents + .["suit_contents"] = suit_contents + .["webbing_contents"] = webbing_contents + .["head_contents"] = head_contents + .["r_pocket_contents"] = r_pocket_contents + .["l_pocket_contents"] = l_pocket_contents .["implants"] = implants /// Copy most vars from another outfit to this one @@ -266,6 +222,13 @@ r_hand = target.r_hand l_hand = target.l_hand backpack_contents = target.backpack_contents + belt_contents = target.belt_contents + shoe_contents = target.shoe_contents + suit_contents = target.suit_contents + webbing_contents = target.webbing_contents + head_contents = target.head_contents + r_pocket_contents = target.r_pocket_contents + l_pocket_contents = target.l_pocket_contents implants = target.implants return TRUE diff --git a/code/datums/outfits/campaign_asset.dm b/code/datums/outfits/campaign_asset.dm index d697d11e08e95..fe4afce8c9670 100644 --- a/code/datums/outfits/campaign_asset.dm +++ b/code/datums/outfits/campaign_asset.dm @@ -13,93 +13,65 @@ l_pocket = /obj/item/storage/pill_bottle/zoom back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/explosive/grenade/incendiary/molotov = 2, + /obj/item/storage/box/m94 = 1, + ) -/datum/outfit/job/som/militia/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/explosive/grenade/stick = 2, + ) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) /datum/outfit/job/som/militia/standard/uzi belt = /obj/item/storage/belt/knifepouch suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/ammo_magazine/smg/uzi/extended = 8, + ) -/datum/outfit/job/som/militia/standard/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - /datum/outfit/job/som/militia/standard/skorpion belt = /obj/item/weapon/gun/shotgun/double/sawn suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness -/datum/outfit/job/som/militia/standard/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/smg/skorpion = 7, + ) /datum/outfit/job/som/militia/standard/mpi_km belt = /obj/item/storage/belt/marine/som suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard + backpack_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/explosive/grenade/incendiary/molotov = 2, + ) -/datum/outfit/job/som/militia/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km = 6, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) /datum/outfit/job/som/militia/standard/shotgun belt = /obj/item/storage/belt/shotgun suit_store = /obj/item/weapon/gun/shotgun/pump/standard -/datum/outfit/job/som/militia/standard/shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/plastique = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 7, + /obj/item/ammo_magazine/handful/flechette = 7, + ) + /datum/outfit/job/som/militia/standard/fanatic head = /obj/item/clothing/head/headband/rambo @@ -107,51 +79,38 @@ belt = /obj/item/weapon/gun/shotgun/double/sawn suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness -/datum/outfit/job/som/militia/standard/fanatic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/explosive/grenade/phosphorus/upp = 1, + /obj/item/ammo_magazine/smg/skorpion = 5, + ) /datum/outfit/job/som/militia/standard/som_smg belt = /obj/item/storage/belt/marine/som suit_store = /obj/item/weapon/gun/smg/som/basic + backpack_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/explosive/grenade/incendiary/molotov = 2, + ) -/datum/outfit/job/som/militia/standard/som_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/smg/som = 6, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) /datum/outfit/job/som/militia/standard/mpi_grenadier belt = /obj/item/storage/belt/marine/som suit_store = /obj/item/weapon/gun/rifle/mpi_km/black/grenadier + backpack_contents = list( + /obj/item/explosive/grenade/som = 2, + ) -/datum/outfit/job/som/militia/standard/mpi_grenadier/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km/black = 6, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) /datum/outfit/job/som/militia/medic name = "Militia Medic" @@ -170,79 +129,62 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/medic back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/roller = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/grenade/incendiary/molotov = 1, + ) -/datum/outfit/job/som/militia/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + suit_contents = list( + /obj/item/explosive/grenade/stick = 2, + ) /datum/outfit/job/som/militia/medic/uzi suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness r_pocket = /obj/item/storage/holster/flarepouch -/datum/outfit/job/som/militia/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/uzi/extended = 7, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/grenade_launcher/single_shot/flare = 1, + /obj/item/explosive/grenade/flare = 6, + ) + /datum/outfit/job/som/militia/medic/skorpion suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness r_pocket = /obj/item/storage/holster/flarepouch -/datum/outfit/job/som/militia/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/skorpion = 7, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/grenade_launcher/single_shot/flare = 1, + /obj/item/explosive/grenade/flare = 6, + ) + /datum/outfit/job/som/militia/medic/paladin suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness r_pocket = /obj/item/storage/pouch/shotgun -/datum/outfit/job/som/militia/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/handful/flechette = 2, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/handful/flechette = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) /datum/outfit/job/som/militia/leader name = "Militia Leader" @@ -261,124 +203,94 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/som/militia/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/radio = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 2, + /obj/item/explosive/grenade/incendiary/molotov = 2, + /obj/item/ammo_magazine/pistol/highpower = 2, + /obj/item/explosive/plastique = 2, + ) + + suit_contents = list( + /obj/item/binoculars = 1, + /obj/item/radio = 1, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/highpower = 1, + ) /datum/outfit/job/som/militia/leader/assault_rifle suit_store = /obj/item/weapon/gun/rifle/m16/ugl -/datum/outfit/job/som/militia/leader/assault_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 6, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) /datum/outfit/job/som/militia/leader/mpi_km suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier belt = /obj/item/storage/belt/marine/som -/datum/outfit/job/som/militia/leader/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/som/militia/leader/som_rifle suit_store = /obj/item/weapon/gun/rifle/som/basic belt = /obj/item/storage/belt/marine/som -/datum/outfit/job/som/militia/leader/som_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/som = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/ammo_magazine/handful/micro_grenade = 2, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) /datum/outfit/job/som/militia/leader/upp_rifle suit_store = /obj/item/weapon/gun/rifle/type71/flamer/standard + + belt_contents = list( + /obj/item/ammo_magazine/rifle/type71 = 6, + ) -/datum/outfit/job/som/militia/leader/upp_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 2, + /obj/item/ammo_magazine/flamer_tank/mini = 2, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/som/militia/leader/lmg_d suit_store = /obj/item/weapon/gun/rifle/lmg_d/magharness belt = /obj/item/storage/belt/marine/som -/datum/outfit/job/som/militia/leader/lmg_d/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/lmg_d = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/freelancer/standard/one/campaign ears = /obj/item/radio/headset/mainship @@ -456,66 +368,71 @@ belt = /obj/item/storage/belt/marine/te_cells suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro + suit_contents = list( + /obj/item/tool/crowbar = 1, + /obj/item/tool/weldingtool = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/tool/shovel/etool = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1, + /obj/item/explosive/plastique = 1, + ) + + /datum/outfit/job/tgmc/campaign_robot/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() H.set_species("Combat Robot") -/datum/outfit/job/tgmc/campaign_robot/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) /datum/outfit/job/tgmc/campaign_robot/machine_gunner belt = /obj/item/storage/belt/sparepouch suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner -/datum/outfit/job/tgmc/campaign_robot/machine_gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + backpack_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 2, + /obj/item/ammo_magazine/pistol/vp70 = 1, + /obj/item/tool/weldingtool = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/weapon/shield/riot/marine/deployable = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 3, + ) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/tool/extinguisher/mini = 1, + /obj/item/ammo_magazine/pistol/vp70 = 4, + ) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) /datum/outfit/job/tgmc/campaign_robot/guardian suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro r_hand = /obj/item/weapon/shield/riot/marine -/datum/outfit/job/tgmc/campaign_robot/guardian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/pistol/vp70 = 1, + /obj/item/tool/weldingtool = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/cell/lasgun/lasrifle = 3, + ) + + webbing_contents = list( + /obj/item/tool/extinguisher/mini = 1, + /obj/item/ammo_magazine/pistol/vp70 = 4, + ) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) /datum/outfit/job/tgmc/campaign_robot/jetpack wear_suit = /obj/item/clothing/suit/modular/robot/heavy/shield @@ -523,38 +440,36 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/mag_harness back = /obj/item/jetpack_marine/heavy -/datum/outfit/job/tgmc/campaign_robot/jetpack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/explosive/grenade = 2, + ) + + r_pocket_contents = list( + /obj/item/cell/lasgun/lasrifle = 3, + ) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) /datum/outfit/job/tgmc/campaign_robot/laser_mg suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol -/datum/outfit/job/tgmc/campaign_robot/laser_mg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/explosive/grenade = 1, + /obj/item/tool/weldingtool = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/ammo_magazine/pistol/vp70 = 3, + ) + + webbing_contents = list( + /obj/item/explosive/grenade = 5, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) + /datum/outfit/job/vsd/standard/grunt_one/campaign ears = /obj/item/radio/headset/mainship/som diff --git a/code/datums/outfits/clf.dm b/code/datums/outfits/clf.dm index 6730c87070d95..c6f2a18dde4a6 100644 --- a/code/datums/outfits/clf.dm +++ b/code/datums/outfits/clf.dm @@ -14,94 +14,69 @@ l_pocket = /obj/item/storage/pill_bottle/zoom back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/explosive/grenade/incendiary/molotov = 2, + /obj/item/storage/box/m94 = 1, + ) -/datum/outfit/job/clf/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/explosive/grenade/stick = 2, + ) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) /datum/outfit/job/clf/standard/uzi belt = /obj/item/storage/belt/knifepouch suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/ammo_magazine/smg/uzi/extended = 8, + ) -/datum/outfit/job/clf/standard/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) /datum/outfit/job/clf/standard/skorpion belt = /obj/item/weapon/gun/shotgun/double/sawn suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness -/datum/outfit/job/clf/standard/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/smg/skorpion = 7, + ) + /datum/outfit/job/clf/standard/mpi_km belt = /obj/item/storage/belt/marine/som suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/plastique = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + ) -/datum/outfit/job/clf/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km = 6, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) /datum/outfit/job/clf/standard/shotgun belt = /obj/item/storage/belt/shotgun suit_store = /obj/item/weapon/gun/shotgun/pump/standard -/datum/outfit/job/clf/standard/shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/plastique = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 7, + /obj/item/ammo_magazine/handful/flechette = 7, + ) + /datum/outfit/job/clf/standard/fanatic head = /obj/item/clothing/head/headband/rambo @@ -109,52 +84,42 @@ belt = /obj/item/weapon/gun/shotgun/double/sawn suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness -/datum/outfit/job/clf/standard/fanatic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/explosive/grenade/phosphorus/upp = 1, + /obj/item/ammo_magazine/smg/skorpion = 5, + ) + /datum/outfit/job/clf/standard/som_smg belt = /obj/item/storage/belt/marine/som suit_store = /obj/item/weapon/gun/smg/som/basic + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/plastique = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + ) -/datum/outfit/job/clf/standard/som_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/smg/som = 6, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) /datum/outfit/job/clf/standard/garand belt = /obj/item/storage/belt/marine/som suit_store = /obj/item/weapon/gun/rifle/garand + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/plastique = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + ) -/datum/outfit/job/clf/standard/garand/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/garand, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/garand = 6, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) //the base loadout for all clf medics /datum/outfit/job/clf/medic @@ -174,79 +139,63 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/medic back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/roller = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/grenade/incendiary/molotov = 1, + ) -/datum/outfit/job/clf/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/explosive/grenade/stick = 2, + ) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) /datum/outfit/job/clf/medic/uzi suit_store = /obj/item/weapon/gun/smg/uzi/mag_harness r_pocket = /obj/item/storage/holster/flarepouch -/datum/outfit/job/clf/medic/uzi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/uzi/extended, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/uzi/extended = 7, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/grenade_launcher/single_shot/flare = 1, + /obj/item/explosive/grenade/flare = 6, + ) + /datum/outfit/job/clf/medic/skorpion suit_store = /obj/item/weapon/gun/smg/skorpion/mag_harness r_pocket = /obj/item/storage/holster/flarepouch -/datum/outfit/job/clf/medic/skorpion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/grenade_launcher/single_shot/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flare, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/skorpion = 7, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/grenade_launcher/single_shot/flare = 1, + /obj/item/explosive/grenade/flare = 6, + ) + /datum/outfit/job/clf/medic/paladin suit_store = /obj/item/weapon/gun/shotgun/pump/cmb/mag_harness r_pocket = /obj/item/storage/pouch/shotgun -/datum/outfit/job/clf/medic/paladin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/handful/flechette = 2, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/handful/flechette = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) //The base loadout for all CLF Specialists /datum/outfit/job/clf/specialist @@ -264,76 +213,63 @@ r_pocket = /obj/item/storage/pouch/pistol l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid - -/datum/outfit/job/clf/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 2, + /obj/item/explosive/grenade/incendiary/molotov = 2, + /obj/item/ammo_magazine/pistol/highpower = 2, + /obj/item/explosive/plastique = 2, + ) + + suit_contents = list( + /obj/item/explosive/grenade/stick = 2, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/highpower = 1, + ) /datum/outfit/job/clf/specialist/dpm suit_store = /obj/item/weapon/gun/rifle/dpm -/datum/outfit/job/clf/specialist/dpm/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/dpm = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/dpm, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/clf/specialist/clf_heavyrifle suit_store = /obj/item/weapon/gun/clf_heavyrifle back = /obj/item/shotgunbox/clf_heavyrifle belt = /obj/item/storage/belt/utility/full -/datum/outfit/job/clf/specialist/clf_heavyrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/clf/specialist/clf_heavymachinegun suit_store = /obj/item/weapon/gun/icc_hmg belt = /obj/item/storage/belt/sparepouch back = /obj/item/storage/backpack/lightpack -/datum/outfit/job/clf/specialist/clf_heavymachinegun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/icc_hmg = 3, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) //the base loadout for all clf leaders /datum/outfit/job/clf/leader @@ -353,121 +289,93 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/radio = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 2, + /obj/item/explosive/grenade/incendiary/molotov = 2, + /obj/item/ammo_magazine/pistol/highpower = 2, + /obj/item/explosive/plastique = 2, + ) -/datum/outfit/job/clf/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/binoculars = 1, + /obj/item/radio = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/highpower = 1, + ) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_R_POUCH) /datum/outfit/job/clf/leader/assault_rifle suit_store = /obj/item/weapon/gun/rifle/m16/ugl -/datum/outfit/job/clf/leader/assault_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/clf/leader/mpi_km suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier belt = /obj/item/storage/belt/marine/som -/datum/outfit/job/clf/leader/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/clf/leader/som_rifle suit_store = /obj/item/weapon/gun/rifle/som/basic belt = /obj/item/storage/belt/marine/som -/datum/outfit/job/clf/leader/som_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/som = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/ammo_magazine/handful/micro_grenade = 2, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) /datum/outfit/job/clf/leader/upp_rifle suit_store = /obj/item/weapon/gun/rifle/type71/flamer/standard -/datum/outfit/job/clf/leader/upp_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/ammo_magazine/rifle/type71 = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BELT) + webbing_contents = list( + /obj/item/explosive/grenade/stick = 2, + /obj/item/ammo_magazine/flamer_tank/mini = 2, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/job/clf/leader/lmg_d suit_store = /obj/item/weapon/gun/rifle/lmg_d/magharness belt = /obj/item/storage/belt/marine/som -/datum/outfit/job/clf/leader/lmg_d/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg_d, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/rifle/lmg_d = 6, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/stick = 4, + /obj/item/explosive/grenade/smokebomb = 1, + ) diff --git a/code/datums/outfits/deathsquad.dm b/code/datums/outfits/deathsquad.dm index bd7097d2da102..45f277cdccdd9 100644 --- a/code/datums/outfits/deathsquad.dm +++ b/code/datums/outfits/deathsquad.dm @@ -17,52 +17,41 @@ back = /obj/item/storage/backpack/commando implants = list(/obj/item/implant/suicide_dust) -/datum/outfit/job/deathsquad/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/explosive/plastique = 6, + /obj/item/tool/crowbar/red = 1, + /obj/item/binoculars = 1, + /obj/item/reagent_containers/food/snacks/wrapped/chunk = 1, + /obj/item/weapon/energy/sword/deathsquad = 1, + /obj/item/weapon/shield/energy = 1, + /obj/item/cell/lasgun/pulse = 1, + /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad = 7, + ) + + suit_contents = list( + /obj/item/explosive/grenade/pmc = 2, + /obj/item/explosive/grenade/smokebomb/acid = 1, + /obj/item/explosive/grenade/smokebomb/neuro = 1, + /obj/item/explosive/grenade/smokebomb/drain = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) + + head_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/clothing/mask/cigarette/cigar/cohiba = 1, + ) + + l_pocket_contents = list( + /obj/item/explosive/grenade/pmc = 4, + /obj/item/explosive/grenade/phosphorus = 2, + ) + + r_pocket_contents = list( + /obj/item/storage/pill_bottle/hypervene = 1, + /obj/item/storage/pill_bottle/packet/ryetalyn = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/elite = 4, + ) /datum/outfit/job/deathsquad/leader name = "Deathsquad Leader" @@ -83,50 +72,42 @@ back = /obj/item/storage/backpack/commando implants = list(/obj/item/implant/suicide_dust) -/datum/outfit/job/deathsquad/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/pinpointer, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4/ds, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/explosive/grenade/pmc = 4, + /obj/item/ammo_magazine/rocket/m57a4/ds = 5, + /obj/item/tool/crowbar/red = 1, + /obj/item/binoculars = 1, + /obj/item/explosive/plastique = 4, + /obj/item/reagent_containers/food/snacks/wrapped/chunk = 1, + /obj/item/weapon/energy/sword/deathsquad = 1, + /obj/item/weapon/shield/energy = 1, + /obj/item/cell/lasgun/pulse = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/pmc = 2, + /obj/item/explosive/grenade/smokebomb/acid = 1, + /obj/item/explosive/grenade/smokebomb/neuro = 1, + /obj/item/explosive/grenade/smokebomb/drain = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) + + head_contents = list( + /obj/item/clothing/mask/cigarette/cigar/cohiba = 1, + /obj/item/pinpointer = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rocket/m57a4/ds = 4, + ) + + r_pocket_contents = list( + /obj/item/storage/pill_bottle/hypervene = 1, + /obj/item/storage/pill_bottle/packet/ryetalyn = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/elite = 4, + ) + /datum/outfit/job/deathsquad/gunner name = "Deathsquad Gunner" @@ -147,46 +128,40 @@ back = /obj/item/storage/backpack/commando implants = list(/obj/item/implant/suicide_dust) -/datum/outfit/job/deathsquad/gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/acid, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/neuro, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/hypervene, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/ryetalyn, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/elite, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/chunk, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/deathsquad, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/pulse, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/explosive/grenade/phosphorus = 1, + /obj/item/explosive/plastique = 4, + /obj/item/ammo_magazine/standard_smartmachinegun = 7, + /obj/item/tool/crowbar/red = 1, + /obj/item/binoculars = 1, + /obj/item/reagent_containers/food/snacks/wrapped/chunk = 1, + /obj/item/weapon/energy/sword/deathsquad = 1, + /obj/item/weapon/shield/energy = 1, + /obj/item/cell/lasgun/pulse = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/pmc = 1, + /obj/item/explosive/grenade/phosphorus = 1, + /obj/item/explosive/grenade/smokebomb/acid = 1, + /obj/item/explosive/grenade/smokebomb/neuro = 1, + /obj/item/explosive/grenade/smokebomb/drain = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) + + head_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/clothing/mask/cigarette/cigar/cohiba = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 4, + ) + + r_pocket_contents = list( + /obj/item/storage/pill_bottle/hypervene = 1, + /obj/item/storage/pill_bottle/packet/ryetalyn = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/elite = 4, + ) + diff --git a/code/datums/outfits/erp.dm b/code/datums/outfits/erp.dm index 7430e8998dfe8..f9bd3a93e370d 100644 --- a/code/datums/outfits/erp.dm +++ b/code/datums/outfits/erp.dm @@ -16,30 +16,24 @@ belt = /obj/item/storage/belt/marine suit_store = /obj/item/weapon/gun/rifle/standard_carbine/beginner -/datum/outfit/job/erp/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/mre_pack/xmas1 = 1, + /obj/item/reagent_containers/food/snacks/mre_pack/xmas2 = 1, + /obj/item/explosive/grenade/creampie = 6, + /obj/item/ammo_magazine/rifle/standard_carbine/ap = 2, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 6, + ) + + webbing_contents = list( + /obj/item/tool/crowbar = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/toy/plush/gnome = 1, + /obj/item/toy/plush/rouny = 1, + /obj/item/toy/bikehorn = 1, + ) /datum/outfit/job/erp/masterprankster name = "ERP Master Prankster" @@ -48,30 +42,25 @@ head = /obj/item/clothing/head/tgmcberet/red2/erp/masterprankster suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle -/datum/outfit/job/erp/masterprankster/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/plasma, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/cell/lasgun/plasma = 2, + /obj/item/reagent_containers/food/snacks/mre_pack/xmas1 = 1, + /obj/item/reagent_containers/food/snacks/mre_pack/xmas2 = 1, + /obj/item/explosive/grenade/creampie = 6, + ) + + belt_contents = list( + /obj/item/cell/lasgun/plasma = 6, + ) + + webbing_contents = list( + /obj/item/tool/crowbar = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/toy/plush/gnome = 1, + /obj/item/toy/plush/rouny = 1, + /obj/item/toy/bikehorn = 1, + ) + /datum/outfit/job/erp/boobookisser name = "ERP Boo-boo kisser" @@ -81,21 +70,20 @@ r_pocket = /obj/item/storage/pouch/medical_injectors/medic belt = /obj/item/storage/belt/lifesaver/full -/datum/outfit/job/erp/boobookisser/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine/ap, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/mre_pack/xmas1 = 1, + /obj/item/reagent_containers/food/snacks/mre_pack/xmas2 = 1, + /obj/item/ammo_magazine/rifle/standard_carbine/ap = 6, + ) + + webbing_contents = list( + /obj/item/tool/crowbar = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/toy/plush/gnome = 1, + /obj/item/toy/plush/rouny = 1, + /obj/item/toy/bikehorn = 1, + ) + /datum/outfit/job/erp/piethrower name = "ERP Pie thrower" @@ -105,39 +93,24 @@ suit_store = /obj/item/weapon/gun/grenade_launcher/multinade_launcher/erp r_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/erp/piethrower/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas1, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/mre_pack/xmas2, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/creampie, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/gnome, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/plush/rouny, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/grenade/creampie = 10, + /obj/item/reagent_containers/food/snacks/mre_pack/xmas1 = 1, + /obj/item/reagent_containers/food/snacks/mre_pack/xmas2 = 1, + ) + + belt_contents = list( + /obj/item/explosive/grenade/creampie = 9, + ) + + webbing_contents = list( + /obj/item/tool/crowbar = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/toy/plush/gnome = 1, + /obj/item/toy/plush/rouny = 1, + /obj/item/toy/bikehorn = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade/creampie = 6, + ) diff --git a/code/datums/outfits/freelancers.dm b/code/datums/outfits/freelancers.dm index 9a93aeb145a93..b294680f12fe5 100644 --- a/code/datums/outfits/freelancers.dm +++ b/code/datums/outfits/freelancers.dm @@ -15,106 +15,93 @@ back = /obj/item/storage/backpack/lightpack l_pocket = /obj/item/storage/pouch/medkit/firstaid -/datum/outfit/job/freelancer/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife, SLOT_IN_BOOT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/reagent_containers/food/snacks/burger/tofu = 1, + /obj/item/reagent_containers/food/drinks/flask/marine = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/m15 = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife = 1, + ) /datum/outfit/job/freelancer/standard name = "Freelancer Standard" jobtype = /datum/job/freelancer/standard -/datum/outfit/job/freelancer/standard/post_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/stack/sheet/metal/small_stack = 1, + /obj/item/stack/sheet/plasteel/medium_stack = 1, + ) /datum/outfit/job/freelancer/standard/one suit_store = /obj/item/weapon/gun/rifle/m16/freelancer r_pocket = /obj/item/storage/pouch/shotgun -/datum/outfit/job/freelancer/standard/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 2, + /obj/item/ammo_magazine/pistol/g22 = 3, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 6, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 4, + ) + ///m16 ugl /datum/outfit/job/freelancer/standard/two suit_store = /obj/item/weapon/gun/rifle/m16/ugl r_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/freelancer/standard/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 2, + /obj/item/ammo_magazine/pistol/g22 = 3, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 6, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 4, + /obj/item/explosive/grenade/incendiary = 2, + ) + ///tx11 /datum/outfit/job/freelancer/standard/three suit_store = /obj/item/weapon/gun/rifle/tx11/freelancerone r_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/freelancer/standard/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/tx11 = 2, + /obj/item/ammo_magazine/pistol/g22 = 3, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/tx11 = 6, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 4, + /obj/item/explosive/grenade/incendiary = 2, + ) + /datum/outfit/job/freelancer/medic name = "Freelancer Medic" @@ -127,19 +114,19 @@ r_pocket = /obj/item/storage/pouch/medical_injectors/medic l_pocket = /obj/item/storage/pouch/magazine/large -/datum/outfit/job/freelancer/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/healthanalyzer = 1, + /obj/item/roller = 1, + /obj/item/tweezers = 1, + /obj/item/ammo_magazine/rifle/famas = 2, + /obj/item/ammo_magazine/pistol/g22 = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/famas = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/famas, SLOT_IN_L_POUCH) /datum/outfit/job/freelancer/grenadier name = "Freelancer Veteran" @@ -150,83 +137,68 @@ suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer r_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/freelancer/grenadier/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/alf_machinecarbine = 2, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/stack/sheet/plasteel/medium_stack = 1, + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/tool/extinguisher/mini = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/alf_machinecarbine = 6, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + /obj/item/explosive/grenade/incendiary = 2, + ) + ///machine gunner /datum/outfit/job/freelancer/grenadier/two belt = /obj/item/storage/belt/sparepouch suit_store = /obj/item/weapon/gun/rifle/m412l1_hpr/freelancer -/datum/outfit/job/freelancer/grenadier/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m412l1_hpr, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/m412l1_hpr = 4, + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/tool/extinguisher/mini = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/m412l1_hpr = 3, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + /obj/item/explosive/grenade/incendiary = 2, + ) + ///actual grenadier /datum/outfit/job/freelancer/grenadier/three suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer r_pocket = /obj/item/storage/pouch/magazine/large -/datum/outfit/job/freelancer/grenadier/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/tx54 = 2, + /obj/item/ammo_magazine/rifle/tx54/incendiary = 2, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/tool/extinguisher/mini = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BACKPACK) + belt_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 2, + /obj/item/ammo_magazine/rifle/tx54 = 2, + /obj/item/ammo_magazine/rifle/tx54/incendiary = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 3, + ) /datum/outfit/job/freelancer/leader @@ -238,9 +210,9 @@ head = /obj/item/clothing/head/frelancer/beret glasses = /obj/item/clothing/glasses/hud/health -/datum/outfit/job/freelancer/leader/post_equip(mob/living/carbon/human/H, visualsOnly) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/sheet/metal/large_stack = 1, + ) /datum/outfit/job/freelancer/leader/one belt = /obj/item/storage/belt/grenade/b17 @@ -248,18 +220,15 @@ suit_store = /obj/item/weapon/gun/rifle/m16/freelancer r_pocket = /obj/item/storage/pouch/shotgun -/datum/outfit/job/freelancer/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 3, + /obj/item/ammo_magazine/pistol/vp70 = 2, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 4, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) ///tx11 /datum/outfit/job/freelancer/leader/two @@ -268,20 +237,16 @@ suit_store = /obj/item/weapon/gun/rifle/tx11/freelancertwo r_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/freelancer/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/tx11 = 3, + /obj/item/ammo_magazine/pistol/vp70 = 2, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 4, + /obj/item/explosive/grenade/incendiary = 2, + ) + ///tx55 /datum/outfit/job/freelancer/leader/three @@ -289,21 +254,17 @@ suit_store = /obj/item/weapon/gun/rifle/tx55/freelancer r_pocket = /obj/item/storage/pouch/magazine/large -/datum/outfit/job/freelancer/leader/three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 3, + /obj/item/ammo_magazine/pistol/vp70 = 2, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 2, + /obj/item/ammo_magazine/rifle/tx54 = 2, + /obj/item/ammo_magazine/rifle/tx54/incendiary = 2, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 3, + ) diff --git a/code/datums/outfits/icc.dm b/code/datums/outfits/icc.dm index 6caa7cb75adf1..cfea04084e4e4 100644 --- a/code/datums/outfits/icc.dm +++ b/code/datums/outfits/icc.dm @@ -24,81 +24,55 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid back = /obj/item/storage/backpack/lightpack/icc - -/datum/outfit/job/icc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/icc_dpistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/icc_dpistol, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/grenade/som = 5, + /obj/item/ammo_magazine/pistol/icc_dpistol = 3, + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/tool/screwdriver = 1, + /obj/item/tool/wrench = 1, + /obj/item/storage/box/m94 = 1, + ) + + suit_contents = list( + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 2, + ) + + webbing_contents = list( + /obj/item/explosive/plastique = 5, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/icc_dpistol = 1, + ) /datum/outfit/job/icc/standard/mpi_km suit_store = /obj/item/weapon/gun/rifle/mpi_km/standard - -/datum/outfit/job/icc/standard/mpi_km/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km/black = 6, + ) /datum/outfit/job/icc/standard/icc_pdw suit_store = /obj/item/weapon/gun/smg/icc_pdw/standard -/datum/outfit/job/icc/standard/icc_pdw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_pdw, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/smg/icc_pdw = 6, + ) + /datum/outfit/job/icc/standard/icc_battlecarbine suit_store = /obj/item/weapon/gun/rifle/icc_battlecarbine/standard -/datum/outfit/job/icc/standard/icc_battlecarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_battlecarbine, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/icc_battlecarbine = 6, + ) /datum/outfit/job/icc/standard/icc_assaultcarbine suit_store = /obj/item/weapon/gun/rifle/icc_assaultcarbine -/datum/outfit/job/icc/standard/icc_assaultcarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_assaultcarbine, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/icc_assaultcarbine = 6, + ) /datum/outfit/job/icc/guard name = "ICC Guard" @@ -109,26 +83,22 @@ gloves = /obj/item/clothing/gloves/marine/icc/guard head = /obj/item/clothing/head/helmet/marine/icc/guard + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 6, + /obj/item/storage/box/m94 = 1, + ) -/datum/outfit/job/icc/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + suit_contents = list( + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 2, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tramadol, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine = 2, + /obj/item/reagent_containers/hypospray/autoinjector/tramadol = 1, + ) /datum/outfit/job/icc/guard/coilgun @@ -137,24 +107,19 @@ l_pocket = /obj/item/storage/pouch/explosive/icc r_pocket = /obj/item/storage/pouch/explosive/icc -/datum/outfit/job/icc/guard/coilgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/heat, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/icc/heat, SLOT_IN_L_POUCH) - - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/icc_coilgun = 6, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rocket/icc/thermobaric = 2, + /obj/item/ammo_magazine/rocket/icc/heat = 2, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rocket/icc = 4, + ) + /datum/outfit/job/icc/guard/icc_autoshotgun suit_store = /obj/item/weapon/gun/rifle/icc_coilgun @@ -162,22 +127,18 @@ l_pocket = /obj/item/storage/pouch/magazine/large/icc r_pocket = /obj/item/storage/pouch/magazine/large/icc -/datum/outfit/job/icc/guard/icc_autoshotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/icc_coilgun = 6, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun, SLOT_IN_R_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag = 3, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/icc_autoshotgun = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) /datum/outfit/job/icc/guard/icc_bagmg wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard/heavy @@ -188,14 +149,13 @@ l_pocket = /obj/item/storage/pouch/magazine/large/icc r_pocket = /obj/item/storage/pouch/magazine/large/icc -/datum/outfit/job/icc/guard/icc_bagmg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/icc_coilgun = 3, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/icc_coilgun = 3, + ) /datum/outfit/job/icc/medic name = "ICC Medic" @@ -207,61 +167,58 @@ belt = /obj/item/storage/belt/lifesaver/icc/ert glasses = /obj/item/clothing/glasses/hud/health -/datum/outfit/job/icc/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 6, + /obj/item/defibrillator = 1, + /obj/item/storage/box/m94 = 1, + ) + + suit_contents = list( + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 2, + ) + + webbing_contents = list( + /obj/item/roller = 1, + /obj/item/tweezers = 1, + /obj/item/storage/pill_bottle/spaceacillin = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, + ) + /datum/outfit/job/icc/medic/icc_machinepistol suit_store = /obj/item/weapon/gun/smg/icc_machinepistol/medic l_pocket = /obj/item/storage/pouch/magazine/large/icc r_pocket = /obj/item/storage/pouch/magazine/large/icc -/datum/outfit/job/icc/medic/icc_machinepistol/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/icc_machinepistol = 3, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/smg/icc_machinepistol/hp = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol/hp, SLOT_IN_L_POUCH) + r_pocket_contents = list( + /obj/item/ammo_magazine/smg/icc_machinepistol = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/icc_machinepistol, SLOT_IN_BACKPACK) /datum/outfit/job/icc/medic/icc_sharpshooter suit_store = /obj/item/weapon/gun/rifle/icc_sharpshooter/medic l_pocket = /obj/item/storage/pouch/magazine/large/icc r_pocket = /obj/item/storage/pouch/magazine/large/icc -/datum/outfit/job/icc/medic/icc_sharpshooter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_R_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/icc_sharpshooter = 3, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/icc_sharpshooter = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_sharpshooter, SLOT_IN_L_POUCH) /datum/outfit/job/icc/leader name = "ICC Leader" @@ -275,26 +232,21 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid r_pocket = /obj/item/storage/pouch/construction/icc/full + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 6, + /obj/item/storage/box/m94 = 1, + ) -/datum/outfit/job/icc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 2, + ) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + webbing_contents = list( + /obj/item/binoculars/tactical/range = 1, + /obj/item/explosive/plastique = 4, + ) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) /datum/outfit/job/icc/leader/ml101 suit_store = /obj/item/weapon/gun/shotgun/pump/icc_heavyshotgun/icc_leader @@ -304,11 +256,6 @@ belt = /obj/item/storage/belt/marine/icc suit_store = /obj/item/weapon/gun/rifle/icc_confrontationrifle/leader -/datum/outfit/job/icc/leader/icc_confrontationrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_confrontationrifle, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/icc_confrontationrifle = 6, + ) diff --git a/code/datums/outfits/imperium.dm b/code/datums/outfits/imperium.dm index 4c518085f103e..da9b707dbde1a 100644 --- a/code/datums/outfits/imperium.dm +++ b/code/datums/outfits/imperium.dm @@ -24,17 +24,20 @@ l_pocket = /obj/item/storage/holster/flarepouch/full back = /obj/item/storage/backpack/lightpack -/datum/outfit/job/imperial/guardsman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/enrg_bar = 2, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/explosive/grenade = 1, + /obj/item/explosive/grenade/incendiary = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_SUIT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) /datum/outfit/job/imperial/guardsman/sergeant name = "Guardsman Sergeant" @@ -55,16 +58,11 @@ l_pocket = /obj/item/storage/pouch/medkit/medic r_pocket = /obj/item/storage/pouch/medical_injectors/medic -/datum/outfit/job/imperial/guardsman/medicae/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/zoom, SLOT_IN_BACKPACK) // closest thing to combat performance drugs + backpack_contents = list( + /obj/item/cell/lasgun/lasrifle = 5, + /obj/item/defibrillator = 1, + /obj/item/storage/pill_bottle/zoom = 1, + ) /datum/outfit/job/imperial/commissar name = "Imperial Commissar" @@ -79,12 +77,12 @@ l_pocket = /obj/item/storage/pouch/medkit/firstaid r_pocket = /obj/item/storage/pouch/magazine/pistol/large/mateba back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/imperial/commissar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_BACKPACK) + + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/enrg_bar = 2, + ) + + suit_contents = list( + /obj/item/explosive/grenade = 1, + /obj/item/explosive/grenade/incendiary = 1, + ) diff --git a/code/datums/outfits/pmc.dm b/code/datums/outfits/pmc.dm index 11e1551e311ce..b3c8447c981f5 100644 --- a/code/datums/outfits/pmc.dm +++ b/code/datums/outfits/pmc.dm @@ -16,41 +16,40 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/satchel + backpack_contents = list( + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/explosive/plastique = 1, + ) + + suit_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/food/snacks/enrg_bar = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade/pmc = 4, + /obj/item/explosive/grenade/smokebomb/drain = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) -/datum/outfit/job/pmc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) /datum/outfit/job/pmc/gunner name = "PMC Gunner" @@ -71,36 +70,35 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 4, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/explosive/plastique = 2, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) + + suit_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/food/snacks/enrg_bar = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/mine/pmc = 2, + /obj/item/explosive/grenade/pmc = 2, + ) -/datum/outfit/job/pmc/gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/mine/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/mine/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_R_POUCH) /datum/outfit/job/pmc/sniper name = "PMC Sniper" @@ -121,27 +119,28 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/satchel - -/datum/outfit/job/pmc/sniper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/pmc, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/sniper/elite = 2, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/explosive_mines/pmc = 1, + /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread = 1, + ) + + suit_contents = list( + /obj/item/ammo_magazine/sniper/elite = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/food/snacks/enrg_bar = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/smokebomb/drain = 2, + /obj/item/explosive/grenade/pmc = 2, + /obj/item/binoculars/tactical/range = 1, + ) /datum/outfit/job/pmc/leader name = "PMC Leader" @@ -162,38 +161,35 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/satchel - -/datum/outfit/job/pmc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/enrg_bar, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp78, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78/pmc(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/impact, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/drain, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/ap = 2, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/plastique = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/pmc = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/food/snacks/enrg_bar = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/ap = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/vp78 = 3, + /obj/item/weapon/gun/pistol/vp78/pmc = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade/impact = 4, + /obj/item/explosive/grenade/smokebomb/drain = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) diff --git a/code/datums/outfits/quick_load_beginners.dm b/code/datums/outfits/quick_load_beginners.dm index c7619d4ef779a..250466ff37fe8 100644 --- a/code/datums/outfits/quick_load_beginners.dm +++ b/code/datums/outfits/quick_load_beginners.dm @@ -21,10 +21,10 @@ belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/mainship/marine -/datum/outfit/quick/beginner/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_HEAD) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/food/snacks/protein_pack = 2, + ) + /datum/outfit/quick/beginner/marine/rifleman name = "Rifleman" @@ -38,33 +38,25 @@ suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/medic l_hand = /obj/item/paper/tutorial/beginner_rifleman -/datum/outfit/quick/beginner/marine/rifleman/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/beginner(human), SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + backpack_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/ammo_magazine/rifle/standard_assaultrifle = 3, + ) + + suit_contents = list( + /obj/item/explosive/grenade = 6, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/standard_assaultrifle = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/standard_heavypistol = 3, + /obj/item/weapon/gun/pistol/standard_heavypistol/beginner = 1, + ) /datum/outfit/quick/beginner/marine/machinegunner name = "Machinegunner" @@ -80,29 +72,24 @@ mask = /obj/item/clothing/mask/rebreather l_hand = /obj/item/paper/tutorial/beginner_machinegunner -/datum/outfit/quick/beginner/marine/machinegunner/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 8, + ) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + suit_contents = list( + /obj/item/weapon/gun/pistol/plasma_pistol = 2, + ) - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 3, + ) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_SUIT) + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/storage/box/m94 = 2, + ) /datum/outfit/quick/beginner/marine/marksman @@ -120,32 +107,34 @@ mask = /obj/item/clothing/mask/breath l_hand = /obj/item/paper/tutorial/beginner_marksman -/datum/outfit/quick/beginner/marine/marksman/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/beginner(human), SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/bicaridine, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/kelotane, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tricordrazine, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + backpack_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/ammo_magazine/rifle/standard_dmr = 3, + ) + + suit_contents = list( + /obj/item/storage/pill_bottle/bicaridine = 1, + /obj/item/storage/pill_bottle/kelotane = 1, + /obj/item/storage/pill_bottle/tricordrazine = 1, + /obj/item/storage/pill_bottle/tramadol = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/weapon/gun/pistol/vp70/beginner = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_dmr = 3, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_dmr = 3, + ) + /datum/outfit/quick/beginner/marine/shotgunner name = "Shotgunner" @@ -161,39 +150,26 @@ mask = /obj/item/clothing/mask/gas/tactical/coif l_hand = /obj/item/paper/tutorial/beginner_shotgunner -/datum/outfit/quick/beginner/marine/shotgunner/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol/beginner(human), SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) + backpack_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/ammo_magazine/handful/slug = 4, + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1, + ) + + suit_contents = list( + /obj/item/storage/box/m94 = 2, + ) + + belt_contents = list( + /obj/item/ammo_magazine/handful/slug = 14, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/plasma_pistol = 3, + /obj/item/weapon/gun/pistol/plasma_pistol/beginner = 1, + ) /datum/outfit/quick/beginner/marine/shocktrooper name = "Shocktrooper" @@ -210,35 +186,34 @@ shoes = /obj/item/clothing/shoes/marine l_hand = /obj/item/paper/tutorial/beginner_shocktrooper -/datum/outfit/quick/beginner/marine/shocktrooper/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) - - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/dylovene, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/powerpack/marine, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/bicaridine, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/kelotane, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tricordrazine, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/pill_bottle/dylovene = 1, + /obj/item/ammo_magazine/flamer_tank/mini = 6, + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1, + ) + + suit_contents = list( + /obj/item/cell/lasgun/volkite/powerpack/marine = 1, + /obj/item/storage/box/m94 = 1, + ) + + belt_contents = list( + /obj/item/cell/lasgun/lasrifle = 6, + ) + + webbing_contents = list( + /obj/item/storage/pill_bottle/bicaridine = 1, + /obj/item/storage/pill_bottle/kelotane = 1, + /obj/item/storage/pill_bottle/tricordrazine = 1, + /obj/item/storage/pill_bottle/tramadol = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) + + shoe_contents = list( + /obj/item/storage/box/MRE = 1, + ) + /datum/outfit/quick/beginner/marine/hazmat name = "Hazmat" @@ -255,25 +230,21 @@ belt = /obj/item/belt_harness/marine l_hand = /obj/item/paper/tutorial/beginner_hazmat -/datum/outfit/quick/beginner/marine/hazmat/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_SUIT) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/tx11 = 8, + ) + + suit_contents = list( + /obj/item/ammo_magazine/rifle/tx11 = 2, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/storage/box/m94 = 2, + ) + /datum/outfit/quick/beginner/marine/cqc name = "CQC" @@ -287,29 +258,25 @@ glasses = /obj/item/clothing/glasses/mgoggles l_hand = /obj/item/paper/tutorial/beginner_cqc -/datum/outfit/quick/beginner/marine/cqc/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 5, + ) + + suit_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 2, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/standard_carbine = 6, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/storage/box/m94 = 2, + ) + /datum/outfit/quick/beginner/marine/chad //Ya gotta be if you pick this loadout name = "Grenadier" @@ -328,55 +295,40 @@ shoes = /obj/item/clothing/shoes/marine l_hand = /obj/item/paper/tutorial/beginner_chad -/datum/outfit/quick/beginner/marine/chad/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) - - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) - - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/bicaridine, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/kelotane, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tricordrazine, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/double/derringer, SLOT_IN_BOOT) //So you can kill yourself when you run out of grenades + backpack_contents = list( + /obj/item/explosive/grenade = 7, + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade = 6, + ) + + belt_contents = list( + /obj/item/explosive/grenade = 9, + ) + + webbing_contents = list( + /obj/item/storage/pill_bottle/bicaridine = 1, + /obj/item/storage/pill_bottle/kelotane = 1, + /obj/item/storage/pill_bottle/tricordrazine = 1, + /obj/item/storage/pill_bottle/tramadol = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) + + shoe_contents = list( + /obj/item/weapon/gun/shotgun/double/derringer = 1, + ) + + l_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) + /datum/outfit/quick/beginner/engineer jobtype = "Squad Engineer" @@ -386,24 +338,31 @@ gloves = /obj/item/clothing/gloves/marine/insulated l_pocket = /obj/item/storage/pouch/tools -/datum/outfit/quick/beginner/engineer/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + suit_contents = list( + /obj/item/stack/sheet/plasteel/medium_stack = 1, + /obj/item/stack/sheet/metal/large_stack = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/chem_grenade/razorburn_small = 1, + /obj/item/circuitboard/apc = 1, + /obj/item/tool/handheld_charger/hicapcell = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) - human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, SLOT_IN_L_POUCH) + shoe_contents = list( + /obj/item/storage/box/MRE = 1, + ) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_small, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/tool/handheld_charger/hicapcell, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + l_pocket_contents = list( + /obj/item/tool/screwdriver = 1, + /obj/item/tool/wirecutters = 1, + /obj/item/tool/wrench = 1, + /obj/item/tool/crowbar = 1, + /obj/item/tool/weldingtool/hugetank = 1, + ) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) /datum/outfit/quick/beginner/engineer/builder name = "Engineer Standard" @@ -418,22 +377,19 @@ glasses = /obj/item/clothing/glasses/welding/superior l_hand = /obj/item/paper/tutorial/builder -/datum/outfit/quick/beginner/engineer/builder/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/full, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/sheet/metal/small_stack = 1, + /obj/item/stack/sandbags_empty/full = 1, + /obj/item/tool/shovel/etool = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/ammo_magazine/standard_lmg = 5, + /obj/item/explosive/plastique = 1, + ) + + suit_contents = list( + /obj/item/stack/sheet/metal/large_stack = 3, + ) + /datum/outfit/quick/beginner/engineer/burnitall name = "Flamethrower" @@ -447,25 +403,24 @@ glasses = /obj/item/clothing/glasses/meson l_hand = /obj/item/paper/tutorial/flamer -/datum/outfit/quick/beginner/engineer/burnitall/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/tool/multitool, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - - human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer/beginner(human), SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer/beginner = 1, + /obj/item/storage/box/explosive_mines/large = 1, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/plastique = 2, + /obj/item/tool/shovel/etool = 1, + ) + + suit_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/circuitboard/apc = 1, + /obj/item/tool/multitool = 1, + ) + + belt_contents = list( + /obj/item/cell/lasgun/lasrifle = 6, + ) + /datum/outfit/quick/beginner/engineer/pcenjoyer name = "Plasma Cutter" @@ -480,21 +435,20 @@ glasses = /obj/item/clothing/glasses/meson l_hand = /obj/item/paper/tutorial/plasmacutter -/datum/outfit/quick/beginner/engineer/pcenjoyer/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + backpack_contents = list( + /obj/item/weapon/gun/smg/standard_machinepistol/compact = 1, + /obj/item/ammo_magazine/smg/standard_machinepistol = 6, + ) + + suit_contents = list( + /obj/item/stack/sheet/metal/large_stack = 2, + /obj/item/stack/sheet/metal/small_stack = 1, + ) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_SUIT) + head_contents = list( + /obj/item/explosive/plastique = 1, + ) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(human), SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) /datum/outfit/quick/beginner/corpsman jobtype = "Squad Corpsman" @@ -504,9 +458,10 @@ glasses = /obj/item/clothing/glasses/hud/health r_hand = /obj/item/medevac_beacon -/datum/outfit/quick/beginner/corpsman/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + shoe_contents = list( + /obj/item/storage/box/MRE = 1, + ) + /datum/outfit/quick/beginner/corpsman/lifesaver name = "Standard Lifesaver" @@ -524,43 +479,31 @@ belt = /obj/item/storage/belt/lifesaver/beginner l_hand = /obj/item/paper/tutorial/lifesaver -/datum/outfit/quick/beginner/corpsman/lifesaver/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/roller/medevac, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) + backpack_contents = list( + /obj/item/storage/box/m94 = 3, + /obj/item/ammo_magazine/packet/p4570 = 7, + /obj/item/tool/extinguisher/mini = 2, + ) + + suit_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 3, + /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 3, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 3, + ) + + webbing_contents = list( + /obj/item/roller = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/roller/medevac = 1, + /obj/item/tweezers = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/handful/repeater = 4, + ) /datum/outfit/quick/beginner/corpsman/hypobelt name = "Standard Hypobelt" @@ -578,38 +521,30 @@ belt = /obj/item/storage/belt/hypospraybelt/beginner l_hand = /obj/item/paper/tutorial/hypobelt -/datum/outfit/quick/beginner/corpsman/hypobelt/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - - human.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/roller/medevac, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) - - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/handful/slug = 6, + /obj/item/storage/box/m94 = 3, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/defibrillator = 1, + /obj/item/reagent_containers/food/snacks/protein_pack = 1, + ) + + suit_contents = list( + /obj/item/roller = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/roller/medevac = 1, + /obj/item/tweezers = 1, + ) + + webbing_contents = list( + /obj/item/stack/medical/splint = 6, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/handful/slug = 4, + ) + /datum/outfit/quick/beginner/smartgunner jobtype = "Squad Smartgunner" @@ -622,9 +557,10 @@ belt = /obj/item/belt_harness/marine glasses = /obj/item/clothing/glasses/night/m56_goggles -/datum/outfit/quick/beginner/smartgunner/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + shoe_contents = list( + /obj/item/storage/box/MRE = 1, + ) + /datum/outfit/quick/beginner/smartgunner/sg29 name = "Standard Smartmachinegun" @@ -635,23 +571,24 @@ suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc l_hand = /obj/item/paper/tutorial/smartmachinegunner -/datum/outfit/quick/beginner/smartgunner/sg29/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) + backpack_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 3, + /obj/item/weapon/gun/pistol/plasma_pistol = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1, + ) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + suit_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/ammo_magazine/standard_smartmachinegun = 1, + ) + + webbing_contents = list( + /obj/item/storage/box/m94 = 3, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) - human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) /datum/outfit/quick/beginner/smartgunner/sg85 name = "Standard Smartminigun" @@ -662,14 +599,12 @@ back = /obj/item/ammo_magazine/minigun_powerpack/smartgun l_hand = /obj/item/paper/tutorial/smartminigunner -/datum/outfit/quick/beginner/smartgunner/sg85/post_equip(mob/living/carbon/human/human, visualsOnly) - . = ..() - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_SUIT) - human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_SUIT) - - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + suit_contents = list( + /obj/item/ammo_magazine/packet/smart_minigun = 2, + ) + webbing_contents = list( + /obj/item/storage/box/m94 = 3, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) diff --git a/code/datums/outfits/quick_load_civil_war.dm b/code/datums/outfits/quick_load_civil_war.dm index 08ccdabe3519e..14389f991c7d8 100644 --- a/code/datums/outfits/quick_load_civil_war.dm +++ b/code/datums/outfits/quick_load_civil_war.dm @@ -16,14 +16,12 @@ r_pocket = /obj/item/storage/pouch/firstaid l_pocket = /obj/item/storage/holster/flarepouch/full -/datum/outfit/quick/civil_war/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/storage/pill_bottle/tramadol = 1, + /obj/item/stack/medical/heal_pack/gauze = 2, + /obj/item/stack/medical/heal_pack/ointment = 2, + /obj/item/stack/medical/splint = 1, + ) /datum/outfit/quick/civil_war/bluecoat name = "Bluecoat" diff --git a/code/datums/outfits/quick_load_outfits.dm b/code/datums/outfits/quick_load_outfits.dm index 8a2ac0481eacd..a33faa65fdcf3 100644 --- a/code/datums/outfits/quick_load_outfits.dm +++ b/code/datums/outfits/quick_load_outfits.dm @@ -10,74 +10,36 @@ /datum/outfit/quick/equip(mob/living/carbon/human/H, visualsOnly = FALSE) - pre_equip(H, visualsOnly) - //Start with uniform,suit,backpack for additional slots. Deletes any existing equipped item to avoid accidentally losing half your loadout. Not suitable for standard gamemodes! if(w_uniform) qdel(H.w_uniform) - H.equip_to_slot_or_del(new w_uniform(H),SLOT_W_UNIFORM, override_nodrop = TRUE) if(wear_suit) qdel(H.wear_suit) - H.equip_to_slot_or_del(new wear_suit(H),SLOT_WEAR_SUIT, override_nodrop = TRUE) if(back) qdel(H.back) - H.equip_to_slot_or_del(new back(H),SLOT_BACK, override_nodrop = TRUE) if(belt) qdel(H.belt) - H.equip_to_slot_or_del(new belt(H),SLOT_BELT, override_nodrop = TRUE) if(gloves) qdel(H.gloves) - H.equip_to_slot_or_del(new gloves(H),SLOT_GLOVES, override_nodrop = TRUE) if(shoes) qdel(H.shoes) - H.equip_to_slot_or_del(new shoes(H),SLOT_SHOES, override_nodrop = TRUE) if(head) qdel(H.head) - H.equip_to_slot_or_del(new head(H),SLOT_HEAD, override_nodrop = TRUE) if(mask) qdel(H.wear_mask) - H.equip_to_slot_or_del(new mask(H),SLOT_WEAR_MASK, override_nodrop = TRUE) if(ears) qdel(H.wear_ear) - if(visualsOnly) - H.equip_to_slot_or_del(new /obj/item/radio/headset(H), SLOT_EARS, override_nodrop = TRUE) - else - H.equip_to_slot_or_del(new ears(H, H.assigned_squad, H.job.type), SLOT_EARS, override_nodrop = TRUE) if(glasses) qdel(H.glasses) - H.equip_to_slot_or_del(new glasses(H),SLOT_GLASSES, override_nodrop = TRUE) - if(id) - H.equip_to_slot_or_del(new id(H),SLOT_WEAR_ID, override_nodrop = TRUE) if(suit_store) qdel(H.s_store) - H.equip_to_slot_or_del(new suit_store(H),SLOT_S_STORE, override_nodrop = TRUE) if(l_hand) qdel(H.l_hand) - H.put_in_l_hand(new l_hand(H)) + if(r_hand) qdel(H.r_hand) - H.put_in_r_hand(new r_hand(H)) - - if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. - if(l_pocket) - qdel(H.l_pocket) - H.equip_to_slot_or_del(new l_pocket(H),SLOT_L_STORE, override_nodrop = TRUE) - if(r_pocket) - qdel(H.r_pocket) - H.equip_to_slot_or_del(new r_pocket(H),SLOT_R_STORE, override_nodrop = TRUE) - - if(backpack_contents) - for(var/path in backpack_contents) - var/number = backpack_contents[path] - if(!isnum(number))//Default to 1 - number = 1 - for(var/i in 1 to number) - H.equip_to_slot_or_del(new path(H),SLOT_IN_BACKPACK, override_nodrop = TRUE) - post_equip(H, visualsOnly) - - H.update_body() - return TRUE + return ..() ////TGMC///// @@ -102,16 +64,18 @@ l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/satchel -/datum/outfit/quick/tgmc/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) /datum/outfit/quick/tgmc/marine/standard_assaultrifle name = "AR-12 rifleman" @@ -120,20 +84,20 @@ suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman belt = /obj/item/storage/belt/marine/t12 -/datum/outfit/quick/tgmc/marine/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/shield/riot/marine/deployable = 1, + /obj/item/ammo_magazine/packet/p10x24mm = 1, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/incendiary = 1, + ) + /datum/outfit/quick/tgmc/marine/standard_laserrifle name = "Laser Rifleman" @@ -142,19 +106,18 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/rifleman belt = /obj/item/storage/belt/marine/te_cells -/datum/outfit/quick/tgmc/marine/standard_laserrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/cell/lasgun/lasrifle = 3, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/flamer_tank/mini = 2, + /obj/item/explosive/grenade = 2, + /obj/item/tool/extinguisher/mini = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/marine/standard_carbine name = "AR-18 Rifleman" @@ -163,20 +126,20 @@ suit_store = /obj/item/weapon/gun/rifle/standard_carbine/standard belt = /obj/item/storage/belt/marine/t18 -/datum/outfit/quick/tgmc/marine/standard_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/packet/p10x24mm = 1, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + /obj/item/ammo_magazine/rifle/standard_carbine = 1, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/incendiary = 1, + ) + /datum/outfit/quick/tgmc/marine/combat_rifle name = "AR-11 Rifleman" @@ -184,21 +147,20 @@ suit_store = /obj/item/weapon/gun/rifle/tx11/standard belt = /obj/item/storage/belt/marine/combat_rifle + + backpack_contents = list( + /obj/item/ammo_magazine/packet/p492x34mm = 2, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade = 3, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/tool/extinguisher/mini = 1, + ) -/datum/outfit/quick/tgmc/marine/combat_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/marine/standard_battlerifle name = "BR-64 Rifleman" @@ -207,20 +169,20 @@ suit_store = /obj/item/weapon/gun/rifle/standard_br/standard belt = /obj/item/storage/belt/marine/standard_battlerifle -/datum/outfit/quick/tgmc/marine/standard_battlerifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/shield/riot/marine/deployable = 1, + /obj/item/ammo_magazine/packet/p10x265mm = 1, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/incendiary = 1, + ) + /datum/outfit/quick/tgmc/marine/standard_skirmishrifle name = "AR-21 Rifleman" @@ -229,20 +191,20 @@ suit_store = /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard belt = /obj/item/storage/belt/marine/standard_skirmishrifle -/datum/outfit/quick/tgmc/marine/standard_skirmishrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/shield/riot/marine/deployable = 1, + /obj/item/ammo_magazine/packet/p10x25mm = 1, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/incendiary = 1, + ) + /datum/outfit/quick/tgmc/marine/alf_shocktrooper name = "ALF-51B Shocktrooper" @@ -253,21 +215,21 @@ suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/assault belt = /obj/item/storage/belt/marine/alf_machinecarbine -/datum/outfit/quick/tgmc/marine/alf_shocktrooper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/alf_machinecarbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/alf_machinecarbine = 2, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/explosive/plastique = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + ) + /datum/outfit/quick/tgmc/marine/standard_machinegunner name = "MG-60 Machinegunner" @@ -276,30 +238,32 @@ belt = /obj/item/storage/belt/sparepouch suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner l_pocket = /obj/item/storage/pouch/construction + + backpack_contents = list( + /obj/item/weapon/shield/riot/marine/deployable = 1, + /obj/item/ammo_magazine/standard_gpmg = 1, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 3, + ) + + belt_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 3, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/explosive/grenade/smokebomb = 2, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/explosive/grenade/flashbang/stun = 1, + ) + + l_pocket_contents = list( + /obj/item/tool/shovel/etool = 1, + /obj/item/stack/sandbags_empty/half = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/stack/barbed_wire/half_stack = 1, + ) -/datum/outfit/quick/tgmc/marine/standard_machinegunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_L_POUCH) /datum/outfit/quick/tgmc/marine/medium_machinegunner name = "MG-27 Machinegunner" @@ -311,27 +275,24 @@ l_pocket = /obj/item/storage/pouch/construction glasses = /obj/item/clothing/glasses/mgoggles -/datum/outfit/quick/tgmc/marine/medium_machinegunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_mmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_mmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_mmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/standard_mmg = 3, + /obj/item/explosive/grenade/smokebomb = 2, + /obj/item/explosive/grenade/flashbang/stun = 1, + ) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(H), SLOT_IN_HOLSTER) + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/smg/m25 = 4, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) + l_pocket_contents = list( + /obj/item/tool/shovel/etool = 1, + /obj/item/stack/sandbags_empty/half = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/stack/barbed_wire/half_stack = 1, + ) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_L_POUCH) /datum/outfit/quick/tgmc/marine/standard_lasermg name = "Laser Machinegunner" @@ -340,19 +301,17 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol belt = /obj/item/storage/belt/marine/te_cells -/datum/outfit/quick/tgmc/marine/standard_lasermg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/cell/lasgun/lasrifle = 3, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/explosive/grenade = 3, + /obj/item/tool/extinguisher/mini = 1, + ) /datum/outfit/quick/tgmc/marine/pyro name = "FL-84 Flamethrower Operator" @@ -365,15 +324,12 @@ back = /obj/item/ammo_magazine/flamer_tank/backtank suit_store = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide -/datum/outfit/quick/tgmc/marine/pyro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(H), SLOT_IN_HOLSTER) + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/smg/m25/extended = 3, + /obj/item/ammo_magazine/packet/p10x20mm = 1, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/marine/standard_shotgun name = "SH-35 Scout" @@ -383,22 +339,22 @@ suit_store = /obj/item/weapon/gun/shotgun/pump/t35/standard belt = /obj/item/storage/belt/shotgun/mixed -/datum/outfit/quick/tgmc/marine/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(H), SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/smg/standard_machinepistol = 3, + /obj/item/ammo_magazine/packet/p10x20mm = 1, + /obj/item/explosive/plastique = 1, + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/weapon/gun/smg/standard_machinepistol/compact = 1, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/binoculars = 1, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/explosive/grenade = 2, + ) + /datum/outfit/quick/tgmc/marine/standard_lasercarbine name = "Laser Carbine Scout" @@ -408,21 +364,20 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/scout belt = /obj/item/storage/belt/marine/te_cells -/datum/outfit/quick/tgmc/marine/standard_lasercarbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/cell/lasgun/lasrifle = 3, + /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical = 1, + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/explosive/plastique = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 3, + /obj/item/storage/box/MRE = 1, + /obj/item/binoculars = 1, + ) + /datum/outfit/quick/tgmc/marine/light_carbine name = "AR-18 Scout" @@ -432,20 +387,19 @@ suit_store = /obj/item/weapon/gun/rifle/standard_carbine/scout belt = /obj/item/storage/belt/marine/t18 -/datum/outfit/quick/tgmc/marine/light_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/packet/p10x24mm = 2, + /obj/item/ammo_magazine/rifle/standard_carbine = 1, + /obj/item/weapon/gun/pistol/standard_heavypistol/tactical = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/explosive/plastique = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 3, + /obj/item/ammo_magazine/pistol/standard_heavypistol = 2, + ) + /datum/outfit/quick/tgmc/marine/shield_tank name = "SMG-25 Guardian" @@ -458,21 +412,21 @@ belt = /obj/item/storage/belt/marine/secondary r_hand = /obj/item/weapon/shield/riot/marine -/datum/outfit/quick/tgmc/marine/shield_tank/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/tool/weldingtool/largetank = 1, + /obj/item/ammo_magazine/smg/m25/extended = 1, + /obj/item/ammo_magazine/packet/p10x20mm = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/storage/box/MRE = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/explosive/grenade = 2, + ) + /datum/outfit/quick/tgmc/marine/machete name = "Assault Marine" @@ -483,14 +437,11 @@ belt = /obj/item/storage/holster/blade/machete/full suit_store = /obj/item/weapon/gun/smg/m25/magharness -/datum/outfit/quick/tgmc/marine/machete/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + webbing_contents = list( + /obj/item/ammo_magazine/smg/m25/extended = 2, + /obj/item/ammo_magazine/smg/m25 = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/marine/scout name = "BR-8 Scout" @@ -501,20 +452,18 @@ suit_store = /obj/item/weapon/gun/rifle/tx8/scout belt = /obj/item/storage/belt/marine/tx8 -/datum/outfit/quick/tgmc/marine/scout/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/scanner(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/smg/standard_machinepistol = 3, + /obj/item/weapon/gun/smg/standard_machinepistol/scanner = 1, + /obj/item/ammo_magazine/rifle/tx8 = 2, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/binoculars = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/explosive/grenade/m15 = 2, + ) //Base TGMC engineer outfit @@ -534,17 +483,17 @@ l_pocket = /obj/item/storage/pouch/tools/full back = /obj/item/storage/backpack/marine/engineerpack -/datum/outfit/quick/tgmc/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/circuitboard/apc = 1, + /obj/item/cell/high = 1, + /obj/item/stack/sheet/plasteel/medium_stack = 1, + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/stack/barbed_wire/half_stack = 1, + ) - H.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + head_contents = list( + /obj/item/explosive/plastique = 2, + ) /datum/outfit/quick/tgmc/engineer/rrengineer name = "Rocket Specialist" @@ -555,14 +504,14 @@ back = /obj/item/storage/holster/backholster/rpg/low_impact belt = /obj/item/storage/belt/marine/t18 -/datum/outfit/quick/tgmc/engineer/rrengineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/grenade/chem_grenade/razorburn_large = 1, + /obj/item/explosive/grenade/smokebomb = 1, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/engineer/sentry name = "Sentry Technician" @@ -571,20 +520,20 @@ suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/engineer belt = /obj/item/storage/belt/marine/t12 -/datum/outfit/quick/tgmc/engineer/sentry/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/gun/sentry/mini/combat_patrol = 2, + /obj/item/ammo_magazine/minisentry = 2, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/flamer_tank/mini = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/grenade/chem_grenade/razorburn_large = 1, + /obj/item/explosive/grenade/smokebomb = 1, + ) /datum/outfit/quick/tgmc/engineer/demolition name = "Demolition Specialist" @@ -594,26 +543,24 @@ back = /obj/item/storage/backpack/marine/tech belt = /obj/item/storage/belt/marine/auto_shotgun -/datum/outfit/quick/tgmc/engineer/demolition/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/minelayer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/minelayer = 1, + /obj/item/storage/box/explosive_mines/large = 1, + /obj/item/storage/box/explosive_mines = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/detpack = 3, + /obj/item/explosive/plastique = 2, + /obj/item/storage/box/MRE = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/explosive/grenade/smokebomb = 1, + ) + + webbing_contents = list( + /obj/item/tool/extinguisher/mini = 1, + /obj/item/assembly/signaler = 1, + /obj/item/explosive/grenade/sticky = 3, + ) + //Base TGMC corpsman outfit /datum/outfit/quick/tgmc/corpsman @@ -633,20 +580,25 @@ l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/corpsman -/datum/outfit/quick/tgmc/corpsman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + suit_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/defibrillator = 1, + ) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline = 1, + ) + + webbing_contents = list( + /obj/item/bodybag/cryobag = 1, + /obj/item/roller = 1, + /obj/item/tweezers_advanced = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/storage/pill_bottle/spaceacillin = 1, + /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) /datum/outfit/quick/tgmc/corpsman/standard_medic name = "AR-12 Corpsman" @@ -654,24 +606,20 @@ suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/medic -/datum/outfit/quick/tgmc/corpsman/standard_medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 2, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 2, + /obj/item/explosive/grenade = 1, + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/ammo_magazine/packet/p10x24mm = 1, + /obj/item/ammo_magazine/rifle/standard_assaultrifle = 3, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_assaultrifle = 3, + ) + /datum/outfit/quick/tgmc/corpsman/standard_smg name = "SMG-90 Corpsman" @@ -679,26 +627,19 @@ suit_store = /obj/item/weapon/gun/smg/standard_smg/tactical -/datum/outfit/quick/tgmc/corpsman/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_smg, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 2, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 2, + /obj/item/ammo_magazine/smg/standard_smg = 5, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/incendiary = 2, + /obj/item/ammo_magazine/packet/p10x20mm = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/smg/standard_smg = 3, + ) + /datum/outfit/quick/tgmc/corpsman/standard_skirmishrifle name = "AR-21 Corpsman" @@ -706,24 +647,19 @@ suit_store = /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard -/datum/outfit/quick/tgmc/corpsman/standard_skirmishrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_skirmishrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_skirmishrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_skirmishrifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_skirmishrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_skirmishrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_skirmishrifle, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 2, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 2, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/sticky = 2, + /obj/item/ammo_magazine/packet/p10x25mm = 1, + /obj/item/ammo_magazine/rifle/standard_skirmishrifle = 3, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_skirmishrifle = 3, + ) + /datum/outfit/quick/tgmc/corpsman/auto_shotgun name = "SH-15 Corpsman" @@ -731,24 +667,21 @@ suit_store = /obj/item/weapon/gun/rifle/standard_autoshotgun/engineer -/datum/outfit/quick/tgmc/corpsman/auto_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_slug, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_slug, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_flechette, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_slug, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 2, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 2, + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/ammo_magazine/rifle/tx15_slug = 2, + /obj/item/ammo_magazine/rifle/tx15_flechette = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/tx15_slug = 1, + /obj/item/ammo_magazine/rifle/tx15_flechette = 2, + ) + /datum/outfit/quick/tgmc/corpsman/laser_medic name = "Laser Rifle Corpsman" @@ -756,23 +689,17 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/medic -/datum/outfit/quick/tgmc/corpsman/laser_medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 2, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 2, + /obj/item/ammo_magazine/flamer_tank/mini = 2, + /obj/item/cell/lasgun/lasrifle = 5, + ) + + r_pocket_contents = list( + /obj/item/cell/lasgun/lasrifle = 3, + ) + /datum/outfit/quick/tgmc/corpsman/laser_carbine name = "Laser Carbine Corpsman" @@ -780,24 +707,18 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/scout -/datum/outfit/quick/tgmc/corpsman/laser_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 2, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 2, + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade = 2, + /obj/item/cell/lasgun/lasrifle = 4, + ) + + r_pocket_contents = list( + /obj/item/cell/lasgun/lasrifle = 3, + ) + //Base TGMC smartgunner outfit /datum/outfit/quick/tgmc/smartgunner @@ -817,17 +738,19 @@ l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/marine/satchel -/datum/outfit/quick/tgmc/smartgunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) /datum/outfit/quick/tgmc/smartgunner/standard_sg name = "SG29 Smart Machinegunner" @@ -835,19 +758,16 @@ suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol -/datum/outfit/quick/tgmc/smartgunner/standard_sg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 4, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 4, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/smartgunner/minigun_sg name = "SG85 Smart Machinegunner" @@ -857,18 +777,15 @@ suit_store = /obj/item/weapon/gun/minigun/smart_minigun/motion_detector back = /obj/item/ammo_magazine/minigun_powerpack/smartgun -/datum/outfit/quick/tgmc/smartgunner/minigun_sg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/packet/smart_minigun = 2, + /obj/item/weapon/gun/smg/standard_machinepistol/compact = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(H), SLOT_IN_BELT) + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/smg/standard_machinepistol = 4, + ) /datum/outfit/quick/tgmc/smartgunner/target_rifle name = "SG62 Smart Machinegunner" @@ -877,22 +794,18 @@ belt = /obj/item/storage/belt/marine/target_rifle suit_store = /obj/item/weapon/gun/rifle/standard_smarttargetrifle/motion -/datum/outfit/quick/tgmc/smartgunner/target_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary = 2, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten = 2, + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + ) + + webbing_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact = 4, + ) + //Base TGMC leader outfit /datum/outfit/quick/tgmc/leader @@ -911,17 +824,19 @@ l_pocket = /obj/item/storage/pouch/grenade/combat_patrol back = /obj/item/storage/backpack/lightpack -/datum/outfit/quick/tgmc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) /datum/outfit/quick/tgmc/leader/standard_assaultrifle name = "AR-12 Patrol Leader" @@ -930,26 +845,27 @@ suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman belt = /obj/item/storage/belt/marine/t12 + backpack_contents = list( + /obj/item/deployable_camera = 1, + /obj/item/ammo_magazine/packet/p10x24mm = 1, + /obj/item/explosive/plastique = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/sticky = 2, + /obj/item/explosive/grenade = 2, + /obj/item/binoculars/fire_support/campaign = 1, + ) + /datum/outfit/quick/tgmc/leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + . = ..() //ivan todo H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/leader/standard_carbine name = "AR-18 Patrol Leader" @@ -958,26 +874,24 @@ suit_store = /obj/item/weapon/gun/rifle/standard_carbine/plasma_pistol belt = /obj/item/storage/belt/marine/t18 -/datum/outfit/quick/tgmc/leader/standard_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/pistol/plasma_pistol = 3, + /obj/item/ammo_magazine/packet/p10x24mm = 1, + /obj/item/explosive/plastique = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/m15 = 1, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/binoculars/fire_support/campaign = 1, + ) + /datum/outfit/quick/tgmc/leader/combat_rifle name = "AR-11 Patrol Leader" @@ -986,26 +900,27 @@ suit_store = /obj/item/weapon/gun/rifle/tx11/standard belt = /obj/item/storage/belt/marine/combat_rifle + backpack_contents = list( + /obj/item/deployable_camera = 2, + /obj/item/ammo_magazine/packet/p492x34mm = 1, + /obj/item/explosive/plastique = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/m15 = 1, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/binoculars/fire_support/campaign = 1, + ) + /datum/outfit/quick/tgmc/leader/combat_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + . = ..() //ivan todo H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/leader/standard_battlerifle name = "BR-64 Patrol Leader" @@ -1014,25 +929,23 @@ suit_store = /obj/item/weapon/gun/rifle/standard_br/standard belt = /obj/item/storage/belt/marine/standard_battlerifle -/datum/outfit/quick/tgmc/leader/standard_battlerifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/packet/p10x265mm = 2, + /obj/item/explosive/plastique = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/sticky = 2, + /obj/item/binoculars/fire_support/campaign = 1, + ) + /datum/outfit/quick/tgmc/leader/auto_shotgun name = "SH-15 Patrol Leader" @@ -1041,26 +954,24 @@ suit_store = /obj/item/weapon/gun/rifle/standard_autoshotgun/plasma_pistol belt = /obj/item/storage/belt/marine/auto_shotgun -/datum/outfit/quick/tgmc/leader/auto_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_slug, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/tx15_slug = 1, + /obj/item/ammo_magazine/rifle/tx15_flechette = 1, + /obj/item/ammo_magazine/pistol/plasma_pistol = 3, + /obj/item/explosive/plastique = 2, + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/m15 = 2, + /obj/item/explosive/grenade/incendiary = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/binoculars/fire_support/campaign = 1, + ) + /datum/outfit/quick/tgmc/leader/standard_laserrifle name = "Laser Rifle Patrol Leader" @@ -1069,26 +980,26 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/rifleman belt = /obj/item/storage/belt/marine/te_cells + backpack_contents = list( + /obj/item/deployable_camera = 2, + /obj/item/cell/lasgun/lasrifle = 1, + /obj/item/explosive/plastique = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/flamer_tank/mini = 2, + /obj/item/explosive/grenade = 2, + /obj/item/binoculars/fire_support/campaign = 1, + ) + /datum/outfit/quick/tgmc/leader/standard_laserrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + . = ..() //ivan todo H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) /datum/outfit/quick/tgmc/leader/oicw name = "AR-55 Patrol Leader" @@ -1098,22 +1009,21 @@ suit_store = /obj/item/weapon/gun/rifle/tx55/combat_patrol belt = /obj/item/storage/belt/marine/oicw -/datum/outfit/quick/tgmc/leader/oicw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/packet/p10x24mm = 2, + /obj/item/ammo_magazine/rifle/standard_carbine = 2, + /obj/item/ammo_magazine/rifle/tx54 = 2, + /obj/item/weapon/gun/pistol/vp70/tactical = 1, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/vp70 = 2, + /obj/item/storage/box/MRE = 1, + /obj/item/explosive/plastique = 1, + /obj/item/binoculars/fire_support/campaign = 1, + ) + //// SOM loadouts //// @@ -1138,17 +1048,19 @@ l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/satchel/som -/datum/outfit/quick/som/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) /datum/outfit/quick/som/marine/standard_assaultrifle name = "V-31 Infantryman" @@ -1157,20 +1069,21 @@ suit_store = /obj/item/weapon/gun/rifle/som/standard belt = /obj/item/storage/belt/marine/som/som_rifle -/datum/outfit/quick/som/marine/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/rifle/som = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 1, + /obj/item/ammo_magazine/handful/micro_grenade = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) + /datum/outfit/quick/som/marine/mpi name = "MPI_KM Infantryman" @@ -1179,20 +1092,18 @@ suit_store = /obj/item/weapon/gun/rifle/mpi_km/black/grenadier belt = /obj/item/storage/belt/marine/som/mpi_black -/datum/outfit/quick/som/marine/mpi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/rifle/mpi_km/black = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 4, + /obj/item/explosive/grenade/incendiary/som = 1, + ) + /datum/outfit/quick/som/marine/light_carbine name = "V-34 Light Infantryman" @@ -1202,20 +1113,18 @@ suit_store = /obj/item/weapon/gun/rifle/som_carbine/black/standard belt = /obj/item/storage/belt/marine/som/carbine_black -/datum/outfit/quick/som/marine/light_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/rifle/mpi_km/carbine/black = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 4, + /obj/item/explosive/grenade/incendiary/som = 1, + ) + /datum/outfit/quick/som/marine/scout name = "V-21 Light Infantryman" @@ -1225,21 +1134,19 @@ suit_store = /obj/item/weapon/gun/smg/som/scout belt = /obj/item/storage/belt/marine/som/som_smg -/datum/outfit/quick/som/marine/scout/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/smg/som = 3, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/binoculars = 1, + ) + /datum/outfit/quick/som/marine/shotgunner name = "V-51 Pointman" @@ -1249,21 +1156,19 @@ wear_suit = /obj/item/clothing/suit/modular/som/light/shield suit_store = /obj/item/weapon/gun/shotgun/som/standard -/datum/outfit/quick/som/marine/shotgunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 3, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/explosive/grenade/flashbang/stun = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/binoculars = 1, + ) + /datum/outfit/quick/som/marine/pyro name = "V-62 Flamethrower Operator" @@ -1275,21 +1180,13 @@ back = /obj/item/ammo_magazine/flamer_tank/backtank suit_store = /obj/item/weapon/gun/flamer/som/mag_harness -/datum/outfit/quick/som/marine/pyro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/ammo_magazine/pistol/som/extended = 2, + /obj/item/storage/box/MRE/som = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/explosive/grenade/som = 1, + ) + /datum/outfit/quick/som/marine/breacher name = "V-21 Breacher" @@ -1301,22 +1198,20 @@ belt = /obj/item/storage/belt/marine/som/som_smg r_hand = /obj/item/weapon/shield/riot/marine/som -/datum/outfit/quick/som/marine/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/tool/weldingtool/largetank = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/ammo_magazine/smg/som = 4, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/explosive/grenade/flashbang/stun = 1, + ) + /datum/outfit/quick/som/marine/breacher_melee name = "CQC Breacher" @@ -1327,32 +1222,21 @@ suit_store = /obj/item/weapon/twohanded/fireaxe/som belt = /obj/item/storage/holster/belt/pistol/m4a3/som -/datum/outfit/quick/som/marine/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/explosive/plastique = 3, + /obj/item/tool/extinguisher = 1, + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 4, + /obj/item/explosive/grenade/incendiary/som = 1, + ) + /datum/outfit/quick/som/marine/machine_gunner name = "V-41 Machinegunner" @@ -1362,32 +1246,25 @@ belt = /obj/item/storage/holster/belt/pistol/m4a3/som l_pocket = /obj/item/storage/pouch/construction/som -/datum/outfit/quick/som/marine/machine_gunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/som_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/som_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/som_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/som_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_L_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/som_mg = 4, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/smokebomb/som = 1, + /obj/item/explosive/grenade/smokebomb/satrapine = 1, + /obj/item/storage/box/MRE/som = 1, + ) + + l_pocket_contents = list( + /obj/item/tool/shovel/etool = 1, + /obj/item/stack/sandbags_empty/half = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/stack/barbed_wire/half_stack = 1, + ) + /datum/outfit/quick/som/marine/charger name = "Charger Infantryman" @@ -1397,20 +1274,19 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/magharness belt = /obj/item/storage/belt/marine/som/volkite -/datum/outfit/quick/som/marine/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/cell/lasgun/volkite = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/tool/extinguisher/mini = 1, + ) + //Base SOM engineer outfit /datum/outfit/quick/som/engineer @@ -1429,17 +1305,18 @@ l_pocket = /obj/item/storage/pouch/tools/som/full back = /obj/item/storage/backpack/lightpack/som -/datum/outfit/quick/som/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/circuitboard/apc = 1, + /obj/item/cell/high = 1, + /obj/item/stack/sheet/plasteel/medium_stack = 1, + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/stack/barbed_wire/half_stack = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + head_contents = list( + /obj/item/explosive/plastique = 2, + ) - H.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) /datum/outfit/quick/som/engineer/standard_assaultrifle name = "V-31 Engineer" @@ -1448,28 +1325,25 @@ suit_store = /obj/item/weapon/gun/rifle/som/standard belt = /obj/item/storage/belt/marine/som/som_rifle -/datum/outfit/quick/som/engineer/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 4, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/plastique = 2, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/handful/micro_grenade = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 2, + /obj/item/explosive/grenade/smokebomb/satrapine = 1, + ) + /datum/outfit/quick/som/engineer/mpi name = "MPI-KM Engineer" @@ -1478,28 +1352,24 @@ suit_store = /obj/item/weapon/gun/rifle/mpi_km/black/magharness belt = /obj/item/storage/belt/marine/som/mpi_black -/datum/outfit/quick/som/engineer/mpi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 4, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/plastique = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/explosive/grenade/smokebomb/som = 1, + /obj/item/explosive/grenade/smokebomb/satrapine = 1, + ) + /datum/outfit/quick/som/engineer/standard_carbine name = "V-34 Engineer" @@ -1508,28 +1378,24 @@ suit_store = /obj/item/weapon/gun/rifle/som_carbine/black/standard belt = /obj/item/storage/belt/marine/som/carbine_black -/datum/outfit/quick/som/engineer/standard_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 4, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/plastique = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/explosive/grenade/smokebomb/som = 1, + /obj/item/explosive/grenade/smokebomb/satrapine = 1, + ) + /datum/outfit/quick/som/engineer/standard_smg name = "V-21 Engineer" @@ -1538,28 +1404,24 @@ suit_store = /obj/item/weapon/gun/smg/som/support belt = /obj/item/storage/belt/marine/som/som_smg -/datum/outfit/quick/som/engineer/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher/mini = 1, + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 3, + /obj/item/ammo_magazine/smg/som = 2, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/plastique = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/smokebomb/som = 2, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/explosive/grenade/som = 1, + /obj/item/explosive/grenade/smokebomb/satrapine = 1, + ) /datum/outfit/quick/som/engineer/standard_shotgun name = "V-51 Engineer" @@ -1568,28 +1430,25 @@ belt = /obj/item/storage/belt/shotgun/som/flechette suit_store = /obj/item/weapon/gun/shotgun/som/support -/datum/outfit/quick/som/engineer/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher/mini = 1, + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 3, + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/stack/cable_coil = 1, + /obj/item/explosive/plastique = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/smokebomb/som = 2, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/explosive/grenade/som = 1, + /obj/item/explosive/grenade/smokebomb/satrapine = 1, + ) + //Base SOM medic outfit /datum/outfit/quick/som/medic @@ -1609,21 +1468,25 @@ l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/lightpack/som -/datum/outfit/quick/som/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/defibrillator = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/roller = 1, + /obj/item/tweezers_advanced = 1, + /obj/item/storage/pill_bottle/spaceacillin = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/outfit/quick/som/medic/standard_assaultrifle name = "V-31 Medic" @@ -1631,52 +1494,43 @@ suit_store = /obj/item/weapon/gun/rifle/som/standard -/datum/outfit/quick/som/medic/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/som = 3, + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade = 2, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 2, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/som = 3, + ) + /datum/outfit/quick/som/medic/mpi name = "MPI_KM Medic" desc = "Keeping your buddies alive and in the fight. Equipped with an MPI_KM assault rifle, medium armor and a good selection of grenades. Packs a large amount of medical supplies, the squad medic is vital to maintaining combat viability. An old weapon that was a common sight during the original Martian rebellion, the MPI's good stopping power, reliability and a healthy dose of nostalgia means it is still seen in use by some among the SOM despite its age." suit_store = /obj/item/weapon/gun/rifle/mpi_km/black/magharness + + backpack_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km/black = 4, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/som = 3, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km/black = 3, + ) -/datum/outfit/quick/som/medic/mpi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/black, SLOT_IN_R_POUCH) /datum/outfit/quick/som/medic/standard_carbine name = "V-34 Medic" @@ -1684,25 +1538,20 @@ suit_store = /obj/item/weapon/gun/rifle/som_carbine/black/standard -/datum/outfit/quick/som/medic/standard_carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km/carbine/black = 4, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/som = 3, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/mpi_km/carbine/black = 3, + ) + /datum/outfit/quick/som/medic/standard_smg name = "V-21 Medic" @@ -1710,27 +1559,20 @@ suit_store = /obj/item/weapon/gun/smg/som/support -/datum/outfit/quick/som/medic/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/som = 6, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/som = 3, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/smg/som = 3, + ) + /datum/outfit/quick/som/medic/standard_shotgun name = "V-51 Medic" @@ -1739,28 +1581,20 @@ r_pocket = /obj/item/storage/pouch/shotgun/som suit_store = /obj/item/weapon/gun/shotgun/som/support -/datum/outfit/quick/som/medic/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/handful/flechette = 7, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/som = 2, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/flechette = 4, + ) + //Base SOM veteran outfit /datum/outfit/quick/som/veteran @@ -1779,16 +1613,19 @@ l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/satchel/som -/datum/outfit/quick/som/veteran/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) /datum/outfit/quick/som/veteran/standard_assaultrifle name = "V-31 Veteran Infantryman" @@ -1798,24 +1635,22 @@ suit_store = /obj/item/weapon/gun/rifle/som/veteran belt = /obj/item/storage/belt/marine/som/som_rifle_ap -/datum/outfit/quick/som/veteran/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/rifle/som/ap = 2, + /obj/item/explosive/grenade/som = 2, + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/handful/micro_grenade = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 2, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 2, + ) + /datum/outfit/quick/som/veteran/standard_smg name = "V-21 Veteran Infantryman" @@ -1824,21 +1659,20 @@ suit_store = /obj/item/weapon/gun/smg/som/veteran belt = /obj/item/storage/belt/marine/som/som_smg_ap -/datum/outfit/quick/som/veteran/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/ap, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/smg/som/ap = 3, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/storage/box/MRE/som = 1, + ) + /datum/outfit/quick/som/veteran/breacher name = "Charger Veteran Breacher" @@ -1851,21 +1685,19 @@ belt = /obj/item/storage/belt/marine/som/volkite r_hand = /obj/item/weapon/shield/riot/marine/som -/datum/outfit/quick/som/veteran/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/weldingtool/largetank = 1, + /obj/item/explosive/plastique = 3, + /obj/item/cell/lasgun/volkite = 3, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + /datum/outfit/quick/som/veteran/charger name = "Charger Veteran Infantryman" @@ -1874,20 +1706,19 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/scout belt = /obj/item/storage/belt/marine/som/volkite -/datum/outfit/quick/som/veteran/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/explosive/plastique = 1, + /obj/item/cell/lasgun/volkite = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) /datum/outfit/quick/som/veteran/caliver name = "Caliver Veteran Infantryman" @@ -1896,20 +1727,19 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/standard belt = /obj/item/storage/belt/marine/som/volkite -/datum/outfit/quick/som/veteran/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/explosive/plastique = 1, + /obj/item/cell/lasgun/volkite = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) /datum/outfit/quick/som/veteran/caliver_pack name = "Caliver Veteran Rifleman" @@ -1921,26 +1751,24 @@ l_pocket = /obj/item/storage/pouch/pistol/som back = /obj/item/cell/lasgun/volkite/powerpack -/datum/outfit/quick/som/veteran/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/explosive/grenade/smokebomb/som = 2, + /obj/item/explosive/grenade/smokebomb/satrapine = 2, + /obj/item/explosive/grenade/flashbang/stun = 2, + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/ammo_magazine/pistol/som = 3, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) + l_pocket_contents = list( + /obj/item/weapon/gun/pistol/som/standard = 1, + ) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_L_POUCH) /datum/outfit/quick/som/veteran/mpi name = "MPI_KM Veteran Infantryman" @@ -1949,20 +1777,18 @@ suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier belt = /obj/item/storage/belt/marine/som/mpi_plum -/datum/outfit/quick/som/veteran/mpi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/rifle/mpi_km/extended = 1, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 4, + /obj/item/explosive/grenade/incendiary/som = 1, + ) /datum/outfit/quick/som/veteran/carbine name = "V-34 Veteran Infantryman" @@ -1971,20 +1797,18 @@ suit_store = /obj/item/weapon/gun/rifle/som_carbine/mag_harness belt = /obj/item/storage/belt/marine/som/carbine -/datum/outfit/quick/som/veteran/carbine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/carbine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/ammo_magazine/rifle/mpi_km/carbine = 1, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 4, + /obj/item/explosive/grenade/incendiary/som = 1, + ) /datum/outfit/quick/som/veteran/culverin name = "Culverin Veteran Machinegunner" @@ -1995,14 +1819,12 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness back = /obj/item/cell/lasgun/volkite/powerpack -/datum/outfit/quick/som/veteran/culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + webbing_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 3, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/outfit/quick/som/veteran/rocket_man name = "V-71 Rocket Veteran" @@ -2016,28 +1838,23 @@ back = /obj/item/storage/holster/backholster/rpg/som/war_crimes l_pocket = /obj/item/storage/pouch/grenade/som -/datum/outfit/quick/som/veteran/rocket_man/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/smg/som = 2, + /obj/item/ammo_magazine/smg/som/rad = 4, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/packet/p10x20mm = 1, + /obj/item/ammo_magazine/smg/som/incendiary = 1, + /obj/item/binoculars = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) + + l_pocket_contents = list( + /obj/item/explosive/grenade/smokebomb/satrapine = 3, + /obj/item/explosive/grenade/rad = 3, + ) /datum/outfit/quick/som/veteran/blinker name = "Blink Assault Veteran" @@ -2049,22 +1866,11 @@ suit_store = /obj/item/weapon/energy/sword/som back = /obj/item/blink_drive -/datum/outfit/quick/som/veteran/blinker/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) + webbing_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) //Base SOM leader outfit /datum/outfit/quick/som/squad_leader @@ -2083,17 +1889,19 @@ l_pocket = /obj/item/storage/pouch/grenade/som/combat_patrol back = /obj/item/storage/backpack/satchel/som -/datum/outfit/quick/som/squad_leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) /datum/outfit/quick/som/squad_leader/standard_assaultrifle name = "V-31 Squad Leader" @@ -2103,26 +1911,22 @@ suit_store = /obj/item/weapon/gun/rifle/som/veteran belt = /obj/item/storage/belt/marine/som/som_rifle_ap -/datum/outfit/quick/som/squad_leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/plastique = 3, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/ammo_magazine/rifle/som/ap = 2, + /obj/item/ammo_magazine/handful/micro_grenade = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 2, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 2, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/storage/box/MRE/som = 1, + /obj/item/cell/lasgun/volkite/small = 1, + /obj/item/binoculars/fire_support/campaign/som = 1, + ) /datum/outfit/quick/som/squad_leader/standard_smg name = "V-21 Squad Leader" @@ -2131,22 +1935,21 @@ suit_store = /obj/item/weapon/gun/smg/som/veteran belt = /obj/item/storage/belt/marine/som/som_smg_ap -/datum/outfit/quick/som/squad_leader/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/cell/lasgun/volkite/small = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/plastique = 2, + /obj/item/ammo_magazine/smg/som/ap = 1, + /obj/item/ammo_magazine/smg/som/incendiary = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/binoculars/fire_support/campaign/som = 1, + ) + /datum/outfit/quick/som/squad_leader/charger name = "Charger Squad Leader" @@ -2155,20 +1958,21 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/scout belt = /obj/item/storage/belt/marine/som/volkite -/datum/outfit/quick/som/squad_leader/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/cell/lasgun/volkite/small = 1, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/plastique = 1, + /obj/item/cell/lasgun/volkite = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/binoculars/fire_support/campaign/som = 1, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/storage/box/MRE/som = 1, + ) + /datum/outfit/quick/som/squad_leader/caliver name = "Caliver Squad Leader" @@ -2177,20 +1981,21 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor belt = /obj/item/storage/belt/marine/som/volkite -/datum/outfit/quick/som/squad_leader/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/cell/lasgun/volkite/small = 1, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/plastique = 1, + /obj/item/cell/lasgun/volkite = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/binoculars/fire_support/campaign/som = 1, + /obj/item/explosive/grenade/flashbang/stun = 1, + /obj/item/storage/box/MRE/som = 1, + ) + /datum/outfit/quick/som/squad_leader/mpi name = "MPI_KM Squad Leader" @@ -2199,18 +2004,16 @@ suit_store = /obj/item/weapon/gun/rifle/mpi_km/grenadier belt = /obj/item/storage/belt/marine/som/mpi_plum -/datum/outfit/quick/som/squad_leader/mpi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/cell/lasgun/volkite/small = 2, + /obj/item/ammo_magazine/rifle/mpi_km/extended = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/explosive/plastique = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 4, + /obj/item/binoculars/fire_support/campaign/som = 1, + ) diff --git a/code/datums/outfits/quick_load_robots.dm b/code/datums/outfits/quick_load_robots.dm index fdd6ba4e578dc..1fc6b3304be2f 100644 --- a/code/datums/outfits/quick_load_robots.dm +++ b/code/datums/outfits/quick_load_robots.dm @@ -55,27 +55,32 @@ belt = /obj/item/storage/belt/marine suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/medic -/datum/outfit/quick/beginner_robot/marine/rifleman/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/cable_coil = 6, + /obj/item/tool/weldingtool = 6, + ) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/explosive/grenade = 6, + ) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) - for(var/amount_to_fill in 1 to 3) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_R_POUCH) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/beginner(robot_user), SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/rifle/standard_assaultrifle = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/standard_heavypistol = 3, + /obj/item/weapon/gun/pistol/standard_heavypistol/beginner = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_assaultrifle = 3, + ) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) /datum/outfit/quick/beginner_robot/marine/machinegunner name = "Machinegunner" @@ -93,25 +98,30 @@ belt = /obj/item/storage/belt/sparepouch suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/beginner -/datum/outfit/quick/beginner_robot/marine/machinegunner/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - for(var/amount_to_fill in 1 to 8) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg , SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 8, + ) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 2, + ) - for(var/amount_to_fill in 1 to 5) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - for(var/amount_to_fill in 1 to 3) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg , SLOT_IN_BELT) - for(var/amount_to_fill in 1 to 2) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_R_POUCH) - for(var/amount_to_fill in 1 to 3) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_R_POUCH) + belt_contents = list( + /obj/item/ammo_magazine/standard_gpmg = 3, + ) - for(var/amount_to_fill in 1 to 2) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg , SLOT_IN_SUIT) + webbing_contents = list( + /obj/item/storage/box/m94 = 5, + ) + + r_pocket_contents = list( + /obj/item/stack/cable_coil = 2, + /obj/item/tool/weldingtool = 3, + ) /datum/outfit/quick/beginner_robot/marine/marksman name = "Marksman" @@ -129,25 +139,28 @@ belt = /obj/item/belt_harness/marine suit_store = /obj/item/weapon/gun/rifle/standard_dmr/beginner -/datum/outfit/quick/beginner_robot/marine/marksman/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/cable_coil = 6, + /obj/item/tool/weldingtool = 6, + ) + + suit_contents = list( + /obj/item/ammo_magazine/rifle/standard_dmr = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/beginner(robot_user), SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/ammo_magazine/pistol/vp70 = 3, + /obj/item/weapon/gun/pistol/vp70/beginner = 1, + ) - for(var/amount_to_fill in 1 to 3) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/standard_dmr = 3, + ) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_SUIT) /datum/outfit/quick/beginner_robot/marine/shotgunner name = "Shotgunner" @@ -165,27 +178,32 @@ belt = /obj/item/storage/belt/shotgun suit_store = /obj/item/weapon/gun/shotgun/combat/standardmarine/beginner -/datum/outfit/quick/beginner_robot/marine/shotgunner/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/cable_coil = 6, + /obj/item/tool/weldingtool = 6, + ) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/storage/box/m94 = 2, + ) - for(var/amount_to_fill in 1 to 14) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) - for(var/amount_to_fill in 1 to 4) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_R_POUCH) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol/beginner(robot_user), SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/handful/slug = 14, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/plasma_pistol = 3, + /obj/item/weapon/gun/pistol/plasma_pistol/beginner = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/slug = 4, + ) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) /datum/outfit/quick/beginner_robot/marine/shocktrooper name = "Shocktrooper" @@ -203,23 +221,27 @@ belt = /obj/item/storage/belt/marine suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/medic -/datum/outfit/quick/beginner_robot/marine/shocktrooper/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/stack/cable_coil = 6, + /obj/item/tool/weldingtool = 6, + ) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/storage/box/m94 = 2, + ) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - for(var/amount_to_fill in 1 to 5) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/cell/lasgun/lasrifle = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/flamer_tank/mini = 5, + ) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) //---- Squad Engineer loadouts /datum/outfit/quick/beginner_robot/engineer @@ -241,41 +263,43 @@ belt = /obj/item/belt_harness/marine suit_store = /obj/item/weapon/gun/rifle/standard_lmg/beginner -/datum/outfit/quick/beginner_robot/engineer/builder/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/full, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_small, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/handheld_charger/hicapcell, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - - robot_user.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, SLOT_IN_L_POUCH) - - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/stack/sheet/metal/small_stack = 1, + /obj/item/stack/sandbags_empty/full = 1, + /obj/item/tool/shovel/etool = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/ammo_magazine/standard_lmg = 5, + /obj/item/explosive/plastique = 1, + ) + + suit_contents = list( + /obj/item/stack/sheet/metal/large_stack = 4, + /obj/item/stack/sheet/plasteel/medium_stack = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/chem_grenade/razorburn_small = 1, + /obj/item/circuitboard/apc = 1, + /obj/item/tool/handheld_charger/hicapcell = 1, + /obj/item/stack/cable_coil = 2, + ) + + l_pocket_contents = list( + /obj/item/tool/screwdriver = 1, + /obj/item/tool/wirecutters = 1, + /obj/item/tool/wrench = 1, + /obj/item/tool/crowbar = 1, + /obj/item/tool/weldingtool/hugetank = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) + /datum/outfit/quick/beginner_robot/engineer/burnitall name = "Flamethrower" @@ -293,40 +317,49 @@ belt = /obj/item/storage/belt/marine suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/beginner -/datum/outfit/quick/beginner_robot/engineer/burnitall/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer/beginner(robot_user), SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_BACKPACK) - - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_small, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/handheld_charger/hicapcell, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/tool/multitool, SLOT_IN_SUIT) - - robot_user.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, SLOT_IN_L_POUCH) - - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) - - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer/beginner = 1, + /obj/item/storage/box/explosive_mines/large = 1, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/plastique = 2, + /obj/item/tool/shovel/etool = 1, + ) + + suit_contents = list( + /obj/item/circuitboard/apc = 1, + /obj/item/stack/sheet/plasteel/medium_stack = 1, + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/tool/multitool = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) + + belt_contents = list( + /obj/item/cell/lasgun/lasrifle = 6, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/chem_grenade/razorburn_small = 1, + /obj/item/circuitboard/apc = 1, + /obj/item/tool/handheld_charger/hicapcell = 1, + /obj/item/stack/cable_coil = 2, + ) + + l_pocket_contents = list( + /obj/item/tool/screwdriver = 1, + /obj/item/tool/wirecutters = 1, + /obj/item/tool/wrench = 1, + /obj/item/tool/crowbar = 1, + /obj/item/tool/weldingtool/hugetank = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) + /datum/outfit/quick/beginner_robot/engineer/pcenjoyer name = "Plasma Cutter" @@ -344,34 +377,40 @@ belt = /obj/item/belt_harness/marine suit_store = /obj/item/tool/pickaxe/plasmacutter -/datum/outfit/quick/beginner_robot/engineer/pcenjoyer/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(robot_user), SLOT_IN_BACKPACK) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_small, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/handheld_charger/hicapcell, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_SUIT) + backpack_contents = list( + /obj/item/weapon/gun/smg/standard_machinepistol/compact = 1, + /obj/item/ammo_magazine/smg/standard_machinepistol = 6, + ) + + suit_contents = list( + /obj/item/stack/sheet/plasteel/medium_stack = 1, + /obj/item/stack/sheet/metal/large_stack = 3, + /obj/item/stack/sheet/metal/small_stack = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/chem_grenade/razorburn_small = 1, + /obj/item/circuitboard/apc = 1, + /obj/item/tool/handheld_charger/hicapcell = 1, + /obj/item/stack/cable_coil = 2, + ) + + l_pocket_contents = list( + /obj/item/tool/screwdriver = 1, + /obj/item/tool/wirecutters = 1, + /obj/item/tool/wrench = 1, + /obj/item/tool/crowbar = 1, + /obj/item/tool/weldingtool/hugetank = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) - robot_user.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_L_POUCH) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, SLOT_IN_L_POUCH) - - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) //---- Squad Corpsman loadouts /datum/outfit/quick/beginner_robot/corpsman @@ -394,42 +433,38 @@ belt = /obj/item/storage/belt/lifesaver/beginner suit_store = /obj/item/weapon/gun/shotgun/pump/lever/repeater/beginner -/datum/outfit/quick/beginner_robot/corpsman/lifesaver/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - - robot_user.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/roller/medevac, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_ACCESSORY) - - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) - - for(var/amount_to_fill in 1 to 4) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) + backpack_contents = list( + /obj/item/storage/box/m94 = 2, + /obj/item/ammo_magazine/packet/p4570 = 4, + /obj/item/stack/cable_coil = 2, + /obj/item/tool/weldingtool = 2, + /obj/item/defibrillator = 1, + ) + + suit_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 3, + /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 3, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 3, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) + + webbing_contents = list( + /obj/item/roller = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/roller/medevac = 1, + /obj/item/tweezers = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/handful/repeater = 4, + ) + /datum/outfit/quick/beginner_robot/corpsman/hypobelt name = "Hypobelt" @@ -448,34 +483,34 @@ belt = /obj/item/storage/belt/hypospraybelt/beginner suit_store = /obj/item/weapon/gun/shotgun/pump/t35/beginner -/datum/outfit/quick/beginner_robot/corpsman/hypobelt/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BACKPACK) - - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) - - robot_user.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/roller/medevac, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_SUIT) - - for(var/amount_to_fill in 1 to 4) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/defibrillator = 1, + /obj/item/reagent_containers/food/snacks/protein_pack = 1, + /obj/item/ammo_magazine/handful/slug = 5, + /obj/item/stack/cable_coil = 2, + /obj/item/tool/weldingtool = 2, + ) + + suit_contents = list( + /obj/item/roller = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/roller/medevac = 1, + /obj/item/tweezers = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) + + webbing_contents = list( + /obj/item/stack/medical/splint = 6, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/handful/slug = 4, + ) //---- Squad Smartgunner loadouts /datum/outfit/quick/beginner_robot/smartgunner @@ -499,27 +534,30 @@ belt = /obj/item/belt_harness/marine suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc -/datum/outfit/quick/beginner_robot/smartgunner/sg29/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/smart_pistol, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol, SLOT_IN_BACKPACK) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 2, + /obj/item/weapon/gun/pistol/smart_pistol = 1, + /obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol = 2, + ) + + suit_contents = list( + /obj/item/ammo_magazine/standard_smartmachinegun = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) + webbing_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/tool/weldingtool = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_ACCESSORY) + r_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) /datum/outfit/quick/beginner_robot/smartgunner/sg85 name = "Standard Smartminigun" @@ -538,18 +576,20 @@ belt = /obj/item/belt_harness/marine suit_store = /obj/item/weapon/gun/minigun/smart_minigun/motion_detector -/datum/outfit/quick/beginner_robot/smartgunner/sg85/post_equip(mob/living/carbon/human/robot_user, visualsOnly) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) - robot_user.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/ammo_magazine/packet/smart_minigun = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_SUIT) - robot_user.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_SUIT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, + ) - robot_user.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_ACCESSORY) - robot_user.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/tool/weldingtool = 2, + ) - for(var/amount_to_fill in 1 to 6) - robot_user.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/explosive/grenade = 6, + ) diff --git a/code/datums/outfits/retired.dm b/code/datums/outfits/retired.dm index ad49b651e672d..a9c8d9a9e69c9 100644 --- a/code/datums/outfits/retired.dm +++ b/code/datums/outfits/retired.dm @@ -17,26 +17,23 @@ ears = /obj/item/radio/headset/distress/retired shoes = /obj/item/clothing/shoes/marine/brown/full -/datum/outfit/job/retired/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/burger/tofu = 1, + /obj/item/reagent_containers/food/drinks/flask/marine = 1, + /obj/item/explosive/grenade/incendiary = 2, + /obj/item/explosive/grenade = 4, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + suit_contents = list( + /obj/item/storage/fancy/chemrettes = 1, + /obj/item/explosive/grenade/m15 = 1, + ) - H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + belt_contents = list( + /obj/item/ammo_magazine/rifle/m41a = 6, + ) +/datum/outfit/job/retired/post_equip(mob/living/carbon/human/H, visualsOnly) var/list/limbs = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) for(var/i in 1 to 2) var/datum/limb/picked_limb = H.get_limb(pick_n_take(limbs)) @@ -56,12 +53,13 @@ back = /obj/item/ammo_magazine/minigun_wheelchair shoes = null -/datum/outfit/job/retired/leader/post_equip(mob/living/carbon/human/H, visualsOnly) - H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/storage/fancy/chemrettes = 2, + /obj/item/explosive/grenade/m15 = 1, + ) +/datum/outfit/job/retired/leader/post_equip(mob/living/carbon/human/H, visualsOnly) H.amputate_limb(BODY_ZONE_L_LEG) H.amputate_limb(BODY_ZONE_R_LEG) var/obj/vehicle/ridden/wheelchair/weaponized/wheelchair = new(H.drop_location()) wheelchair.buckle_mob(H, TRUE) - diff --git a/code/datums/outfits/sectoid.dm b/code/datums/outfits/sectoid.dm index f22cd69157e91..f9d99b9ecdd6a 100644 --- a/code/datums/outfits/sectoid.dm +++ b/code/datums/outfits/sectoid.dm @@ -20,6 +20,11 @@ /datum/action/ability/activable/sectoid/mindfray, ) + belt_contents = list( + /obj/item/ammo_magazine/rifle/sectoid_rifle = 5, + /obj/item/tool/crowbar/red = 1, + ) + /datum/outfit/job/sectoid/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() H.set_species("Sectoid") @@ -30,15 +35,6 @@ for(var/ability in abilities) H.add_ability(ability) -/datum/outfit/job/sectoid/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BELT) - /datum/outfit/job/sectoid/psionic abilities = list( /datum/action/ability/activable/sectoid/mindmeld, diff --git a/code/datums/outfits/shipside.dm b/code/datums/outfits/shipside.dm index 6437f506b08b1..79c735d4f3be0 100644 --- a/code/datums/outfits/shipside.dm +++ b/code/datums/outfits/shipside.dm @@ -111,12 +111,13 @@ back = /obj/item/storage/backpack/marine/engineerpack suit_store = /obj/item/storage/holster/belt/pistol/m4a3/vp70 -/datum/outfit/job/command/transportofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/stack/sheet/plasteel/large_stack = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/stack/barbed_wire/full = 1, + ) + /datum/outfit/job/command/pilot name = PILOT_OFFICER @@ -196,12 +197,13 @@ r_pocket = /obj/item/storage/pouch/construction back = /obj/item/storage/backpack/marine/engineerpack -/datum/outfit/job/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/stack/sheet/plasteel/large_stack = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/stack/barbed_wire/full = 1, + ) + /datum/outfit/job/engineering/tech name = SHIP_TECH @@ -234,9 +236,9 @@ head = /obj/item/clothing/head/tgmccap/req r_pocket = /obj/item/storage/pouch/general/large -/datum/outfit/job/requisitions/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/supplytablet, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/supplytablet = 1, + ) /datum/outfit/job/medical/professor name = CHIEF_MEDICAL_OFFICER @@ -254,6 +256,8 @@ head = /obj/item/clothing/head/cmo r_pocket = /obj/item/storage/pouch/surgery l_pocket = /obj/item/storage/pouch/medkit/doctor + r_hand = /obj/item/tweezers + l_hand = /obj/item/reagent_containers/glass/bottle/lemoline/doctor /datum/outfit/job/medical/professor/robot @@ -263,10 +267,6 @@ shoes = null gloves = null -/datum/outfit/job/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) /datum/outfit/job/medical/medicalofficer name = MEDICAL_DOCTOR @@ -284,6 +284,8 @@ head = /obj/item/clothing/head/surgery/purple r_pocket = /obj/item/storage/pouch/surgery l_pocket = /obj/item/storage/pouch/medkit/doctor + r_hand = /obj/item/tweezers + l_hand = /obj/item/reagent_containers/glass/bottle/lemoline/doctor /datum/outfit/job/medical/medicalofficer/robot @@ -294,11 +296,6 @@ shoes = null gloves = null -/datum/outfit/job/medical/medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) - /datum/outfit/job/medical/researcher name = MEDICAL_RESEARCHER jobtype = /datum/job/terragov/medical/researcher @@ -314,6 +311,8 @@ mask = /obj/item/clothing/mask/surgical r_pocket = /obj/item/storage/pouch/surgery l_pocket = /obj/item/storage/pouch/medkit/doctor + r_hand = /obj/item/tweezers + l_hand = /obj/item/reagent_containers/glass/bottle/lemoline/doctor /datum/outfit/job/medical/researcher/robot @@ -323,10 +322,6 @@ shoes = null gloves = null -/datum/outfit/job/medical/researcher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_hand(new /obj/item/tweezers, SLOT_IN_R_POUCH) - H.equip_to_slot_or_hand(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_S_STORE) /datum/outfit/job/civilian/liaison name = CORPORATE_LIAISON diff --git a/code/datums/outfits/skeleton.dm b/code/datums/outfits/skeleton.dm index e1323df6d4bdf..433cbb70440ef 100644 --- a/code/datums/outfits/skeleton.dm +++ b/code/datums/outfits/skeleton.dm @@ -19,10 +19,7 @@ ears = /obj/item/radio/headset/survivor r_pocket = /obj/item/flashlight l_pocket = /obj/item/tool/crowbar/red - -/datum/outfit/job/skeleton/basic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/milk, SLOT_L_HAND) + l_hand = /obj/item/reagent_containers/food/drinks/milk /datum/outfit/job/skeleton/leader name = "Skeleton Commander" @@ -37,7 +34,4 @@ ears = /obj/item/radio/headset/survivor r_pocket = /obj/item/flashlight l_pocket = /obj/item/reagent_containers/food/drinks/milk - -/datum/outfit/job/skeleton/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/milk, SLOT_L_HAND) + l_hand = /obj/item/reagent_containers/food/drinks/milk diff --git a/code/datums/outfits/som_ert.dm b/code/datums/outfits/som_ert.dm index af44da634296e..6321ce9a2a323 100644 --- a/code/datums/outfits/som_ert.dm +++ b/code/datums/outfits/som_ert.dm @@ -17,78 +17,67 @@ l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som -/datum/outfit/job/som/ert/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) /datum/outfit/job/som/ert/standard/standard_assaultrifle suit_store = /obj/item/weapon/gun/rifle/som/mag_harness belt = /obj/item/storage/belt/marine/som/som_rifle - -/datum/outfit/job/som/ert/standard/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 2, + /obj/item/ammo_magazine/rifle/som = 2, + /obj/item/storage/box/m94 = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/som = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/handful/micro_grenade = 2, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) /datum/outfit/job/som/ert/standard/standard_smg suit_store = /obj/item/weapon/gun/smg/som/support belt = /obj/item/storage/belt/marine/som/som_smg -/datum/outfit/job/som/ert/standard/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 2, + /obj/item/ammo_magazine/smg/som = 3, + /obj/item/storage/box/m94 = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/smg/som = 6, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/binoculars = 1, + ) /datum/outfit/job/som/ert/standard/standard_shotgun back = /obj/item/storage/backpack/satchel/som @@ -96,43 +85,39 @@ wear_suit = /obj/item/clothing/suit/modular/som/light/shield suit_store = /obj/item/weapon/gun/shotgun/som/standard -/datum/outfit/job/som/ert/standard/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/binoculars = 1, + ) /datum/outfit/job/som/ert/standard/charger suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/magharness belt = /obj/item/storage/belt/marine/som/volkite -/datum/outfit/job/som/ert/standard/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 2, + /obj/item/cell/lasgun/volkite = 2, + /obj/item/storage/box/m94 = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 2, + /obj/item/tool/extinguisher/mini = 1, + ) //Base SOM medic outfit /datum/outfit/job/som/ert/medic @@ -152,88 +137,75 @@ l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som -/datum/outfit/job/som/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/roller = 1, + /obj/item/tweezers_advanced = 1, + /obj/item/storage/pill_bottle/spaceacillin = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, + ) /datum/outfit/job/som/ert/medic/standard_assaultrifle suit_store = /obj/item/weapon/gun/rifle/som/mag_harness -/datum/outfit/job/som/ert/medic/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/ammo_magazine/rifle/som = 3, + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, + /obj/item/ammo_magazine/handful/micro_grenade = 1, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/tool/crowbar/red = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/rifle/som = 3, + ) + /datum/outfit/job/som/ert/medic/standard_smg suit_store = /obj/item/weapon/gun/smg/som/support -/datum/outfit/job/som/ert/medic/standard_smg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/ammo_magazine/smg/som = 6, + /obj/item/tool/extinguisher = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/tool/crowbar/red = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/smg/som = 3, + ) + /datum/outfit/job/som/ert/medic/standard_shotgun r_pocket = /obj/item/storage/pouch/shotgun/som suit_store = /obj/item/weapon/gun/shotgun/som/support -/datum/outfit/job/som/ert/medic/standard_shotgun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/ammo_magazine/handful/flechette = 6, + /obj/item/tool/extinguisher = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/tool/crowbar/red = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/flechette = 4, + ) //Base SOM veteran outfit /datum/outfit/job/som/ert/veteran @@ -253,39 +225,38 @@ l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som -/datum/outfit/job/som/ert/veteran/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) /datum/outfit/job/som/ert/veteran/charger suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet -/datum/outfit/job/som/ert/veteran/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/grenade/som = 1, + /obj/item/ammo_magazine/pistol/highpower = 2, + /obj/item/weapon/gun/pistol/highpower = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/explosive/plastique = 2, + /obj/item/cell/lasgun/volkite = 3, + /obj/item/tool/crowbar/red = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) /datum/outfit/job/som/ert/veteran/breacher_vet head = /obj/item/clothing/head/modular/som/lorica @@ -294,47 +265,42 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet l_hand = /obj/item/weapon/shield/riot/marine/som -/datum/outfit/job/som/ert/veteran/breacher_vet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/tool/weldingtool/largetank = 1, + /obj/item/explosive/plastique = 2, + /obj/item/cell/lasgun/volkite = 4, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/incendiary/som = 2, + ) + /datum/outfit/job/som/ert/veteran/caliver suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet -/datum/outfit/job/som/ert/veteran/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/grenade/som = 1, + /obj/item/ammo_magazine/pistol/highpower = 2, + /obj/item/weapon/gun/pistol/highpower = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/explosive/plastique = 2, + /obj/item/cell/lasgun/volkite = 3, + /obj/item/tool/crowbar/red = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) + /datum/outfit/job/som/ert/veteran/caliver_pack belt = /obj/item/storage/belt/grenade/som @@ -342,40 +308,35 @@ l_pocket = /obj/item/storage/pouch/pistol/som back = /obj/item/cell/lasgun/volkite/powerpack -/datum/outfit/job/som/ert/veteran/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + belt_contents = list( + /obj/item/explosive/grenade/smokebomb/som = 2, + /obj/item/explosive/grenade/smokebomb/satrapine = 2, + /obj/item/explosive/grenade/som = 3, + /obj/item/explosive/grenade/incendiary/som = 2, + ) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/ammo_magazine/pistol/highpower = 2, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/weapon/gun/pistol/highpower = 1, + ) /datum/outfit/job/som/ert/veteran/culverin belt = /obj/item/weapon/gun/shotgun/double/sawn suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness back = /obj/item/cell/lasgun/volkite/powerpack -/datum/outfit/job/som/ert/veteran/culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/tool/crowbar/red = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) /datum/outfit/job/som/ert/veteran/rpg head = /obj/item/clothing/head/modular/som/bio @@ -385,28 +346,24 @@ back = /obj/item/storage/holster/backholster/rpg/som/ert l_pocket = /obj/item/storage/pouch/grenade/som -/datum/outfit/job/som/ert/veteran/rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/smg/som = 2, + /obj/item/ammo_magazine/smg/som/rad = 4, + ) + + webbing_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/binoculars = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/ammo_magazine/smg/som/incendiary = 1, + /obj/item/storage/box/MRE/som = 1, + ) + + l_pocket_contents = list( + /obj/item/explosive/grenade/smokebomb/som = 2, + /obj/item/explosive/grenade/smokebomb/satrapine = 2, + /obj/item/explosive/grenade/rad = 2, + ) /datum/outfit/job/som/ert/veteran/pyro head = /obj/item/clothing/head/modular/som/hades @@ -415,46 +372,36 @@ back = /obj/item/ammo_magazine/flamer_tank/backtank suit_store = /obj/item/weapon/gun/flamer/som/mag_harness -/datum/outfit/job/som/ert/veteran/pyro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_SUIT) + suit_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/grenade/som = 1, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/som/extended = 3, + /obj/item/storage/box/MRE/som = 1, + /obj/item/tool/crowbar/red = 1, + ) + /datum/outfit/job/som/ert/veteran/shotgunner belt = /obj/item/storage/belt/shotgun/som/flechette wear_suit = /obj/item/clothing/suit/modular/som/light/shield suit_store = /obj/item/weapon/gun/shotgun/som/burst/ert -/datum/outfit/job/som/ert/veteran/shotgunner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 5, + /obj/item/weapon/gun/pistol/som/standard = 1, + /obj/item/tool/extinguisher = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/binoculars = 1, + ) //Base SOM leader outfit /datum/outfit/job/som/ert/leader @@ -474,99 +421,95 @@ l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som -/datum/outfit/job/som/ert/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) /datum/outfit/job/som/ert/leader/standard_assaultrifle suit_store = /obj/item/weapon/gun/rifle/som/veteran belt = /obj/item/storage/belt/marine/som/som_rifle_ap -/datum/outfit/job/som/ert/leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/som/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/explosive/plastique = 2, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/weapon/energy/sword/som = 1, + /obj/item/ammo_magazine/rifle/som/ap = 1, + /obj/item/ammo_magazine/handful/micro_grenade = 1, + /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 2, + /obj/item/ammo_magazine/handful/micro_grenade/cluster = 1, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/cell/lasgun/volkite/small = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/binoculars/tactical/range = 1, + ) + /datum/outfit/job/som/ert/leader/charger suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet -/datum/outfit/job/som/ert/leader/charger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/cell/lasgun/volkite/small = 2, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/plastique = 2, + /obj/item/cell/lasgun/volkite = 2, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + /obj/item/weapon/energy/sword/som = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/binoculars/tactical/range = 1, + /obj/item/storage/box/MRE/som = 1, + ) + /datum/outfit/job/som/ert/leader/caliver suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/somvet + backpack_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/cell/lasgun/volkite/small = 2, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/plastique = 2, + /obj/item/cell/lasgun/volkite = 3, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/binoculars/tactical/range = 1, + /obj/item/storage/box/MRE/som = 1, + ) -/datum/outfit/job/som/ert/leader/caliver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(H), SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/outfit/job/som/ert/leader/caliver_pack suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor belt = /obj/item/belt_harness back = /obj/item/cell/lasgun/volkite/powerpack -/datum/outfit/job/som/ert/leader/caliver_pack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/tool/crowbar/red = 1, + /obj/item/weapon/energy/sword/som = 1, + /obj/item/explosive/plastique = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE/som = 1, + ) + /datum/outfit/job/som/ert/veteran/breacher_melee head = /obj/item/clothing/head/modular/som/lorica @@ -574,37 +517,23 @@ suit_store = /obj/item/weapon/twohanded/fireaxe/som belt = /obj/item/storage/holster/belt/pistol/m4a3/som -/datum/outfit/job/som/ert/veteran/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som = 2, + /obj/item/explosive/plastique = 5, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/grenade/som = 3, + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/explosive/grenade/rad = 2, + /obj/item/explosive/grenade/incendiary/som = 1, + ) + /datum/outfit/job/som/ert/veteran/breacher_rpg head = /obj/item/clothing/head/modular/som/lorica @@ -614,28 +543,26 @@ back = /obj/item/storage/holster/backholster/rpg/som/ert l_pocket = /obj/item/storage/pouch/explosive/som -/datum/outfit/job/som/ert/veteran/breacher_rpg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/thermobaric, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/heat, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/som/rad, SLOT_IN_L_POUCH) + belt_contents = list( + /obj/item/explosive/grenade/som = 3, + /obj/item/explosive/grenade/smokebomb/som = 2, + /obj/item/explosive/grenade/smokebomb/satrapine = 2, + /obj/item/explosive/grenade/rad = 2, + ) + + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/explosive/plastique = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/tool/extinguisher/mini = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rocket/som/thermobaric = 2, + /obj/item/ammo_magazine/rocket/som/heat = 1, + /obj/item/ammo_magazine/rocket/som/rad = 1, + ) /datum/outfit/job/som/ert/veteran/breacher_flamer head = /obj/item/clothing/head/modular/som/hades @@ -644,17 +571,17 @@ belt = /obj/item/storage/belt/sparepouch/som back = /obj/item/weapon/gun/flamer/som/mag_harness -/datum/outfit/job/som/ert/veteran/breacher_flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/som, SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/flamer_tank/large/som = 3, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/explosive/plastique = 1, + /obj/item/storage/box/MRE/som = 1, + /obj/item/tool/extinguisher/mini = 1, + ) /datum/outfit/job/som/ert/veteran/breacher_culverin head = /obj/item/clothing/head/modular/som/lorica @@ -663,13 +590,13 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness back = /obj/item/cell/lasgun/volkite/powerpack -/datum/outfit/job/som/ert/veteran/breacher_culverin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/tool/crowbar/red = 1, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/weapon/energy/sword/som = 1, + ) + /datum/outfit/job/som/ert/medic/breacher head = /obj/item/clothing/head/modular/som/lorica @@ -677,81 +604,64 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet l_hand = /obj/item/weapon/shield/riot/marine/som -/datum/outfit/job/som/ert/medic/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/defibrillator = 1, + /obj/item/cell/lasgun/volkite = 5, + /obj/item/storage/pill_bottle/russian_red = 1, + /obj/item/explosive/plastique = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/storage/box/MRE/som = 1, + /obj/item/explosive/grenade/incendiary/som = 1, + /obj/item/tool/crowbar/red = 1, + ) + + r_pocket_contents = list( + /obj/item/cell/lasgun/volkite = 3, + ) + /datum/outfit/job/som/ert/leader/breacher_melee suit_store = /obj/item/weapon/twohanded/fireaxe/som belt = /obj/item/storage/holster/belt/pistol/m4a3/som -/datum/outfit/job/som/ert/leader/breacher_melee/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(H), SLOT_IN_HOLSTER) - - H.equip_to_slot_or_del(new /obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/MRE/som = 1, + /obj/item/ammo_magazine/pistol/som/extended = 2, + /obj/item/explosive/plastique = 3, + /obj/item/tool/extinguisher = 1, + /obj/item/explosive/grenade/som = 2, + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 2, + /obj/item/binoculars/tactical/range = 1, + /obj/item/explosive/grenade/rad = 2, + ) /datum/outfit/job/som/ert/leader/breacher_ranged suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet l_hand = /obj/item/weapon/shield/riot/marine/som -/datum/outfit/job/som/ert/leader/breacher_ranged/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new/obj/item/binoculars/tactical/range, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/tool/extinguisher = 1, + /obj/item/tool/weldingtool/largetank = 1, + /obj/item/explosive/plastique = 3, + /obj/item/clothing/glasses/welding = 1, + /obj/item/cell/lasgun/volkite = 3, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/som = 1, + ) + + webbing_contents = list( + /obj/item/explosive/grenade/som = 1, + /obj/item/weapon/energy/sword/som = 1, + /obj/item/explosive/grenade/rad = 2, + ) + diff --git a/code/datums/outfits/som_shipside.dm b/code/datums/outfits/som_shipside.dm index 4a5a9ca8f5058..af739a55a3b77 100644 --- a/code/datums/outfits/som_shipside.dm +++ b/code/datums/outfits/som_shipside.dm @@ -4,9 +4,9 @@ id = /obj/item/card/id/gold -/datum/outfit/job/som/command/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/binoculars/fire_support/campaign/som = 1, + ) /datum/outfit/job/som/command/fieldcommander name = SOM_FIELD_COMMANDER @@ -66,12 +66,12 @@ r_pocket = /obj/item/storage/pouch/construction back = /obj/item/storage/backpack/marine/engineerpack -/datum/outfit/job/som/engineering/chief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + r_pocket_contents = list( + /obj/item/stack/sheet/metal/large_stack = 1, + /obj/item/stack/sheet/plasteel/large_stack = 1, + /obj/item/stack/sandbags/large_stack = 1, + /obj/item/stack/barbed_wire/full = 1, + ) /datum/outfit/job/som/engineering/tech name = SOM_TECH @@ -121,10 +121,11 @@ r_pocket = /obj/item/storage/pouch/medkit/doctor l_pocket = /obj/item/storage/pouch/surgery -/datum/outfit/job/som/medical/professor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/tweezers_advanced = 1, + /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, + ) + /datum/outfit/job/som/medical/medicalofficer name = SOM_MEDICAL_DOCTOR @@ -141,10 +142,10 @@ mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/surgery/purple -/datum/outfit/job/som/medical/medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/tweezers_advanced = 1, + /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, + ) /datum/outfit/job/som/civilian/chef name = SOM_CHEF @@ -161,7 +162,7 @@ mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/surgery/purple -/datum/outfit/job/som/civilian/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/tweezers_advanced = 1, + /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, + ) diff --git a/code/datums/outfits/special_forces.dm b/code/datums/outfits/special_forces.dm index 75d570e61cf6a..0935528cd88cc 100644 --- a/code/datums/outfits/special_forces.dm +++ b/code/datums/outfits/special_forces.dm @@ -17,40 +17,33 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack -/datum/outfit/job/special_forces/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 2, + /obj/item/explosive/plastique = 2, + /obj/item/tool/crowbar/red = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 2, + /obj/item/stack/medical/splint = 1, + ) + + head_contents = list( + /obj/item/clothing/glasses/mgoggles = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/g22 = 3, + /obj/item/weapon/gun/pistol/g22 = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade/m15 = 4, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + ) /datum/outfit/job/special_forces/breacher name = "Special Response Force Breacher" @@ -71,37 +64,32 @@ l_pocket = /obj/item/storage/pouch/medkit/firstaid back = /obj/item/storage/backpack/lightpack -/datum/outfit/job/special_forces/breacher/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/metal, SLOT_R_HAND) + backpack_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 2, + /obj/item/explosive/plastique = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 2, + /obj/item/stack/medical/splint = 1, + /obj/item/explosive/grenade/m15 = 2, + ) + + head_contents = list( + /obj/item/clothing/glasses/mgoggles = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/g22 = 3, + /obj/item/weapon/gun/pistol/g22 = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) /datum/outfit/job/special_forces/drone_operator name = "Special Response Force Drone Operator" @@ -122,40 +110,35 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack -/datum/outfit/job/special_forces/drone_operator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/box11x35mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/box11x35mm, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/uav_turret, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/deployable_vehicle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/unmanned_vehicle_remote, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/reagent_containers/food/snacks/sliceable/sandwiches/meatbread = 1, + /obj/item/tool/weldingtool/largetank = 1, + /obj/item/tool/wrench = 1, + /obj/item/ammo_magazine/box11x35mm = 2, + /obj/item/uav_turret = 1, + /obj/item/deployable_vehicle = 1, + /obj/item/unmanned_vehicle_remote = 1, + ) + + head_contents = list( + /obj/item/clothing/glasses/mgoggles = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/g22 = 3, + /obj/item/weapon/gun/pistol/g22 = 1, + ) + + r_pocket_contents = list( + /obj/item/explosive/grenade/m15 = 4, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + ) /datum/outfit/job/special_forces/medic name = "Special Response Force Medic" @@ -176,26 +159,26 @@ l_pocket = /obj/item/storage/pouch/magazine/large back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/healthanalyzer = 1, + /obj/item/roller = 1, + /obj/item/tweezers = 1, + /obj/item/tool/crowbar = 1, + ) -/datum/outfit/job/special_forces/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + head_contents = list( + /obj/item/clothing/glasses/mgoggles = 1, + ) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) + webbing_contents = list( + /obj/item/ammo_magazine/pistol/g22 = 3, + /obj/item/weapon/gun/pistol/g22 = 1, + ) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/smg/m25/ap = 3, + ) /datum/outfit/job/special_forces/leader name = "Special Response Force Leader" @@ -216,35 +199,27 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack - -/datum/outfit/job/special_forces/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator/civi, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/incendiary, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/incendiary, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 2, + /obj/item/defibrillator/civi = 1, + /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 1, + /obj/item/stack/medical/splint = 1, + /obj/item/explosive/grenade/m15 = 2, + /obj/item/explosive/grenade/incendiary = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/rifle/m16 = 6, + ) + + webbing_contents = list( + /obj/item/ammo_magazine/pistol/g22 = 3, + /obj/item/weapon/gun/pistol/g22 = 1, + ) + + r_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + /obj/item/ammo_magazine/handful/incendiary = 2, + ) diff --git a/code/datums/outfits/survivor.dm b/code/datums/outfits/survivor.dm index c015beb0500ec..8fb38bf81cb4d 100644 --- a/code/datums/outfits/survivor.dm +++ b/code/datums/outfits/survivor.dm @@ -32,15 +32,16 @@ l_pocket = /obj/item/storage/pouch/surgery r_pocket = /obj/item/flashlight/combat -/datum/outfit/job/survivor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/polyhexanide, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/roller = 1, + /obj/item/defibrillator = 1, + /obj/item/reagent_containers/hypospray/autoinjector/polyhexanide = 1, + /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/tool/crowbar = 1, + ) + /datum/outfit/job/survivor/doctor name = "Doctor's Assistant Survivor" @@ -57,29 +58,30 @@ mask = /obj/item/clothing/mask/surgical ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/doctor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/bicaridine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/kelotane, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/tramadol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/tricordrazine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/dylovene, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/packet/isotonic, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/inaprovaline, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_R_POUCH) + backpack_contents = list( + /obj/item/flashlight = 1, + /obj/item/tool/crowbar = 1, + ) + + belt_contents = list( + /obj/item/roller = 1, + /obj/item/defibrillator = 1, + /obj/item/healthanalyzer = 1, + /obj/item/stack/medical/heal_pack/advanced/bruise_pack = 2, + /obj/item/stack/medical/heal_pack/advanced/burn_pack = 2, + /obj/item/stack/medical/splint = 2, + /obj/item/storage/pill_bottle/packet/bicaridine = 1, + /obj/item/storage/pill_bottle/packet/kelotane = 1, + /obj/item/storage/pill_bottle/packet/tramadol = 1, + /obj/item/storage/pill_bottle/packet/tricordrazine = 1, + /obj/item/storage/pill_bottle/packet/dylovene = 1, + /obj/item/storage/pill_bottle/packet/isotonic = 1, + /obj/item/storage/pill_bottle/inaprovaline = 1, + ) + + r_pocket_contents = list( + /obj/item/tweezers = 1, + ) /datum/outfit/job/survivor/liaison name = "Liaison Survivor" @@ -107,16 +109,16 @@ suit_store = /obj/item/weapon/gun/pistol/g22 ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/flashlight/combat, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine = 1, + /obj/item/tool/crowbar = 1, + ) + belt_contents = list( + /obj/item/ammo_magazine/pistol/g22 = 2, + /obj/item/flashlight/combat = 1, + /obj/item/weapon/telebaton = 1, + ) /datum/outfit/job/survivor/civilian name = "Civilian Survivor" @@ -127,11 +129,11 @@ back = /obj/item/storage/backpack/satchel/norm ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/civilian/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/tool/crowbar = 1, + /obj/item/flashlight = 1, + /obj/item/weapon/combat_knife/upp = 1, + ) /datum/outfit/job/survivor/chef @@ -145,20 +147,20 @@ back = /obj/item/storage/backpack ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/flashlight, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/crazy, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/soup/mysterysoup, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/packaged_hdogs, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/organ, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/chocolateegg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/meat/xeno, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/pastries/xemeatpie, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/pastries/birthdaycakeslice, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/donut/meat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/flashlight = 1, + /obj/item/tool/kitchen/knife/butcher = 1, + /obj/item/reagent_containers/food/snacks/burger/crazy = 1, + /obj/item/reagent_containers/food/snacks/soup/mysterysoup = 1, + /obj/item/reagent_containers/food/snacks/packaged_hdogs = 1, + /obj/item/reagent_containers/food/snacks/organ = 1, + /obj/item/reagent_containers/food/snacks/chocolateegg = 1, + /obj/item/reagent_containers/food/snacks/meat/xeno = 1, + /obj/item/reagent_containers/food/snacks/pastries/xemeatpie = 1, + /obj/item/reagent_containers/food/snacks/pastries/birthdaycakeslice = 1, + /obj/item/reagent_containers/food/snacks/donut/meat = 1, + /obj/item/tool/crowbar = 1, + ) /datum/outfit/job/survivor/botanist @@ -174,13 +176,10 @@ l_pocket = /obj/item/flashlight r_pocket = /obj/item/tool/crowbar -/datum/outfit/job/survivor/botanist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, SLOT_IN_BACKPACK) - + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris = 2, + /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus = 2, + ) /datum/outfit/job/survivor/atmos name = "Atmospherics Technician Survivor" @@ -198,21 +197,25 @@ l_pocket = /obj/item/storage/pouch/construction ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/multitool, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BELT) + backpack_contents = list( + /obj/item/lightreplacer = 1, + /obj/item/deployable_floodlight = 1, + ) - H.equip_to_slot_or_del(new /obj/item/lightreplacer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/deployable_floodlight, SLOT_IN_BACKPACK) + belt_contents = list( + /obj/item/tool/screwdriver = 1, + /obj/item/tool/wrench = 1, + /obj/item/tool/wirecutters = 1, + /obj/item/tool/crowbar = 1, + /obj/item/tool/weldingtool = 1, + /obj/item/tool/multitool = 1, + /obj/item/stack/cable_coil = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/stack/sheet/plasteel/small_stack = 1, + ) /datum/outfit/job/survivor/chaplain @@ -225,14 +228,12 @@ back = /obj/item/storage/backpack/satchel/norm ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/candle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/bible, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/tool/candle = 3, + /obj/item/tool/lighter = 1, + /obj/item/storage/bible = 1, + /obj/item/tool/crowbar = 1, + ) /datum/outfit/job/survivor/miner name = "Miner Survivor" @@ -247,12 +248,12 @@ r_hand = /obj/item/clothing/suit/space/rig/mining ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/miner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/whiskey, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/storage/fancy/cigarettes = 1, + /obj/item/tool/lighter = 1, + /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, + /obj/item/explosive/grenade/incendiary/molotov = 1, + ) /datum/outfit/job/survivor/salesman @@ -267,14 +268,12 @@ glasses = /obj/item/clothing/glasses/sunglasses/aviator ears = /obj/item/radio/survivor -/datum/outfit/job/survivor/salesman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/weapon/gun/pistol/holdout = 1, + /obj/item/ammo_magazine/pistol/holdout = 3, + /obj/item/tool/lighter/zippo = 1, + /obj/item/tool/crowbar = 1, + ) /datum/outfit/job/survivor/marshal @@ -292,12 +291,11 @@ ears = /obj/item/radio/survivor head = /obj/item/clothing/head/slouch -/datum/outfit/job/survivor/marshal/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/restraints/handcuffs, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BELT) - + belt_contents = list( + /obj/item/restraints/handcuffs = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/tool/crowbar = 1, + ) /datum/outfit/job/survivor/rambo name = "Overpowered Survivor" diff --git a/code/datums/outfits/upp.dm b/code/datums/outfits/upp.dm index c50c94bd172da..fcd000929dedf 100644 --- a/code/datums/outfits/upp.dm +++ b/code/datums/outfits/upp.dm @@ -16,43 +16,42 @@ l_pocket = /obj/item/storage/pouch/magazine/pistol/large back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/explosive/grenade/upp = 1, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine = 2, + /obj/item/reagent_containers/hypospray/autoinjector/tramadol = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/splint = 1, + /obj/item/reagent_containers/food/snacks/upp = 1, + /obj/item/radio = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/plastique = 2, + ) + + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/pistol/c99 = 6, + ) + + r_pocket_contents = list( + /obj/item/weapon/gun/pistol/c99 = 1, + ) + /datum/outfit/job/upp/standard/hvh name = "USL Gunner (HvH)" wear_suit = /obj/item/clothing/suit/storage/faction/UPP/hvh -/datum/outfit/job/upp/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/tramadol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/c99, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - - /datum/outfit/job/upp/medic name = "USL Surgeon" jobtype = /datum/job/upp/medic @@ -71,40 +70,42 @@ l_pocket = /obj/item/storage/pouch/general/large back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/healthanalyzer = 1, + /obj/item/roller = 1, + /obj/item/reagent_containers/food/snacks/upp = 2, + /obj/item/radio = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/incendiary/molotov = 1, + /obj/item/ammo_magazine/smg/skorpion = 4, + ) + + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + + l_pocket_contents = list( + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/advanced/tricordrazine = 1, + /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, + ) + + r_pocket_contents = list( + /obj/item/storage/firstaid/adv = 1, + ) + /datum/outfit/job/upp/medic/hvh name = "USL Surgeon (HvH)" wear_suit = /obj/item/clothing/suit/storage/faction/UPP/hvh -/datum/outfit/job/upp/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - - /datum/outfit/job/upp/heavy name = "USL Powder Monkey" jobtype = /datum/job/upp/heavy @@ -122,37 +123,37 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack + backpack_contents = list( + /obj/item/stack/sheet/metal/small_stack = 1, + /obj/item/reagent_containers/food/snacks/upp = 2, + /obj/item/radio = 1, + /obj/item/storage/box/m94 = 2, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/incendiary/molotov = 2, + /obj/item/explosive/plastique = 1, + /obj/item/ammo_magazine/flamer_tank = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + + r_pocket_contents = list( + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 1, + ) + /datum/outfit/job/upp/heavy/hvh name = "USL Powder Monkey (HvH)" wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh -/datum/outfit/job/upp/heavy/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) - - /datum/outfit/job/upp/leader name = "USL Captain" jobtype = /datum/job/upp/leader @@ -170,30 +171,32 @@ l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid back = /obj/item/storage/backpack/lightpack -/datum/outfit/job/upp/leader/hvh - name = "USL Captain (HvH)" + backpack_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/stack/sheet/plasteel/small_stack = 1, + /obj/item/reagent_containers/food/snacks/upp = 1, + /obj/item/radio = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/ammo_magazine/rifle/type71 = 4, + ) - wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + r_pocket_contents = list( + /obj/item/binoculars = 1, + /obj/item/explosive/plastique = 2, + ) -/datum/outfit/job/upp/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_R_POUCH) +/datum/outfit/job/upp/leader/hvh + name = "USL Captain (HvH)" - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + wear_suit = /obj/item/clothing/suit/storage/faction/UPP/heavy/hvh diff --git a/code/datums/outfits/upp_commando.dm b/code/datums/outfits/upp_commando.dm index 8f1fe1ba5f1a3..70e779568efcd 100644 --- a/code/datums/outfits/upp_commando.dm +++ b/code/datums/outfits/upp_commando.dm @@ -19,30 +19,31 @@ back = /obj/item/storage/backpack/lightpack implants = list(/obj/item/implant/suicide_dust) - -/datum/outfit/job/upp/commando/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/restraints/handcuffs, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/chloralhydrate, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/sleeptoxin, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + backpack_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/reagent_containers/food/snacks/upp = 2, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + /obj/item/chameleon = 1, + /obj/item/explosive/plastique = 2, + /obj/item/binoculars = 1, + /obj/item/restraints/handcuffs = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + + r_pocket_contents = list( + /obj/item/reagent_containers/hypospray/advanced = 1, + /obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, + /obj/item/reagent_containers/glass/bottle/sleeptoxin = 1, + ) /datum/outfit/job/upp/commando/medic @@ -65,34 +66,36 @@ back = /obj/item/storage/backpack/lightpack implants = list(/obj/item/implant/suicide_dust) - -/datum/outfit/job/upp/commando/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/skorpion, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/attachable/suppressor, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/attachable/reddot, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/healthanalyzer = 1, + /obj/item/binoculars = 1, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/chameleon = 1, + /obj/item/clothing/glasses/hud/health = 1, + /obj/item/ammo_magazine/smg/skorpion = 5, + /obj/item/attachable/suppressor = 1, + /obj/item/attachable/reddot = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + + l_pocket_contents = list( + /obj/item/reagent_containers/hypospray/advanced/oxycodone = 1, + /obj/item/reagent_containers/hypospray/advanced/tricordrazine = 1, + /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, + ) + + r_pocket_contents = list( + /obj/item/storage/firstaid/adv = 1, + ) /datum/outfit/job/upp/commando/leader @@ -115,26 +118,27 @@ back = /obj/item/storage/backpack/lightpack implants = list(/obj/item/implant/suicide_dust) - -/datum/outfit/job/upp/commando/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/radio, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/chameleon, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_R_POUCH) - - H.equip_to_slot_or_del(new /obj/item/weapon/combat_knife/upp, SLOT_IN_BOOT) + backpack_contents = list( + /obj/item/reagent_containers/food/snacks/upp = 1, + /obj/item/radio = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/phosphorus/upp = 2, + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/stack/sheet/plasteel/small_stack = 1, + /obj/item/chameleon = 1, + /obj/item/ammo_magazine/rifle/type71 = 3, + ) + + suit_contents = list( + /obj/item/explosive/grenade/upp = 2, + ) + + shoe_contents = list( + /obj/item/weapon/combat_knife/upp = 1, + ) + + r_pocket_contents = list( + /obj/item/binoculars = 1, + /obj/item/assembly/signaler = 1, + /obj/item/detpack = 1, + ) diff --git a/code/datums/outfits/vsd.dm b/code/datums/outfits/vsd.dm index d5d9b1816bbfd..36fa7a8cee3ad 100644 --- a/code/datums/outfits/vsd.dm +++ b/code/datums/outfits/vsd.dm @@ -17,35 +17,33 @@ back = /obj/item/storage/backpack/lightpack/vsd belt = /obj/item/storage/holster/belt/pistol/standard_pistol -/datum/outfit/job/vsd/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 4, + ) + + suit_contents = list( + /obj/item/explosive/grenade/vsd = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) + + belt_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 6, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) + + webbing_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/explosive/plastique = 1, + /obj/item/explosive/grenade/vsd = 2, + ) /datum/outfit/job/vsd/standard/grunt_one wear_suit = /obj/item/clothing/suit/storage/marine/vsd/desert @@ -53,18 +51,17 @@ suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard mask = /obj/item/clothing/mask/gas/vsd -/datum/outfit/job/vsd/standard/grunt_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 4, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + suit_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) /datum/outfit/job/vsd/standard/ksg w_uniform = /obj/item/clothing/under/vsd/shirt/webbing @@ -72,52 +69,41 @@ suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/standard l_pocket = /obj/item/storage/pouch/shotgun -/datum/outfit/job/vsd/standard/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 4, + /obj/item/explosive/grenade/vsd = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) + suit_contents = list( + /obj/item/explosive/grenade/vsd = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 4, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) /datum/outfit/job/vsd/standard/grunt_second suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard head = /obj/item/clothing/head/vsd -/datum/outfit/job/vsd/standard/grunt_second/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 4, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) /datum/outfit/job/vsd/standard/grunt_third suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 4, + ) -/datum/outfit/job/vsd/standard/grunt_third/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) //outfits @@ -138,62 +124,63 @@ back = /obj/item/storage/backpack/lightpack/vsd belt = /obj/item/storage/belt/utility/full -/datum/outfit/job/vsd/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/storage/box/MRE = 2, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 2, + /obj/item/stack/sheet/metal/large_stack = 2, + /obj/item/explosive/plastique = 4, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/explosive/grenade/vsd = 1, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/explosive/plastique = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/explosive/grenade/vsd = 2, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) /datum/outfit/job/vsd/engineer/l26 suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/engineer -/datum/outfit/job/vsd/engineer/l26/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/attachable/buildasentry, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 2, + /obj/item/attachable/buildasentry = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + webbing_contents = list( + /obj/item/stack/sheet/metal/large_stack = 1, + ) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_ACCESSORY) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 2, + ) /datum/outfit/job/vsd/engineer/vsd_rifle suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor head = /obj/item/clothing/head/vsd -/datum/outfit/job/vsd/engineer/vsd_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) + webbing_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_ACCESSORY) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) //outfits @@ -214,87 +201,81 @@ l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd -/datum/outfit/job/vsd/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/defibrillator = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + ) + + webbing_contents = list( + /obj/item/roller = 1, + /obj/item/tweezers_advanced = 1, + /obj/item/storage/pill_bottle/spaceacillin = 1, + /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, + /obj/item/bodybag/cryobag = 1, + /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) /datum/outfit/job/vsd/medic/ksg suit_store = /obj/item/weapon/gun/shotgun/pump/ksg/support l_pocket = /obj/item/storage/pouch/shotgun -/datum/outfit/job/vsd/medic/ksg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 3, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + /obj/item/ammo_magazine/handful/buckshot = 3, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_L_POUCH) + suit_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_SUIT) + l_pocket_contents = list( + /obj/item/ammo_magazine/handful/buckshot = 4, + ) /datum/outfit/job/vsd/medic/vsd_rifle suit_store = /obj/item/weapon/gun/rifle/vsd_rifle -/datum/outfit/job/vsd/medic/vsd_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 3, + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) + suit_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_SUIT) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) /datum/outfit/job/vsd/medic/vsd_pdw suit_store = /obj/item/weapon/gun/smg/vsd_pdw/medic -/datum/outfit/job/vsd/medic/vsd_pdw/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 3, + /obj/item/ammo_magazine/smg/vsd_pdw = 2, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_L_POUCH) + suit_contents = list( + /obj/item/ammo_magazine/smg/vsd_pdw = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/vsd_pdw, SLOT_IN_SUIT) + l_pocket_contents = list( + /obj/item/ammo_magazine/smg/vsd_pdw = 2, + ) //outfits @@ -312,19 +293,19 @@ back = /obj/item/storage/backpack/lightpack/vsd belt = /obj/item/storage/holster/belt/pistol/standard_pistol -/datum/outfit/job/vsd/spec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/explosive/grenade/vsd = 2, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 2, + ) + webbing_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/explosive/plastique = 1, + ) /datum/outfit/job/vsd/spec/flamer wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor @@ -335,21 +316,18 @@ w_uniform = /obj/item/clothing/under/vsd/shirt/webbing l_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/vsd/spec/flamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + suit_contents = list( + /obj/item/ammo_magazine/flamer_tank/large = 2, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/tool/extinguisher/mini = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large, SLOT_IN_SUIT) + l_pocket_contents = list( + /obj/item/explosive/grenade/phosphorus/upp = 6, + ) /datum/outfit/job/vsd/spec/demolitionist wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor @@ -359,29 +337,21 @@ suit_store = /obj/item/weapon/gun/launcher/rocket/vsd l_pocket = /obj/item/storage/pouch/explosive -/datum/outfit/job/vsd/spec/demolitionist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) + backpack_contents = list( + /obj/item/explosive/plastique = 4, + /obj/item/storage/box/MRE = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/ammo_magazine/rocket/vsd/he = 4, + /obj/item/explosive/grenade/vsd = 2, + ) + + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rocket/vsd/he = 4, + ) /datum/outfit/job/vsd/spec/gunslinger wear_suit = /obj/item/clothing/suit/storage/marine/vsd @@ -389,34 +359,23 @@ belt = /obj/item/storage/holster/belt/korovin w_uniform = /obj/item/clothing/under/vsd/shirt/webbing -/datum/outfit/job/vsd/spec/gunslinger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/xmdivider/gunslinger(H), SLOT_IN_BELT) + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 4, + /obj/item/ammo_magazine/pistol/xmdivider = 4, + /obj/item/explosive/grenade/vsd = 3, + ) + + belt_contents = list( + /obj/item/ammo_magazine/pistol/xmdivider = 6, + /obj/item/weapon/gun/pistol/xmdivider/gunslinger = 1, + ) + + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + ) /datum/outfit/job/vsd/spec/uslspec_one w_uniform = /obj/item/clothing/under/vsd/upp @@ -426,36 +385,30 @@ suit_store = /obj/item/weapon/gun/rifle/type71/flamer l_pocket = /obj/item/storage/pouch/magazine -/datum/outfit/job/vsd/spec/uslspec_one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/ammo_magazine/rifle/type71 = 4, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 2, + /obj/item/storage/box/MRE = 1, + /obj/item/storage/box/m94 = 1, + /obj/item/tool/crowbar/red = 1, + /obj/item/explosive/grenade/vsd = 1, + /obj/item/explosive/plastique = 2, + ) + + belt_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 6, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) + + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/flamer_tank/mini = 2, + ) /datum/outfit/job/vsd/spec/uslspec_two w_uniform = /obj/item/clothing/under/vsd/upp @@ -467,26 +420,20 @@ back = /obj/item/shotgunbox/clf_heavyrifle l_pocket = /obj/item/storage/pouch/grenade -/datum/outfit/job/vsd/spec/uslspec_two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + belt_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 6, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/upp, SLOT_IN_L_POUCH) + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + l_pocket_contents = list( + /obj/item/explosive/grenade/vsd = 3, + /obj/item/explosive/grenade/upp = 3, + ) //juggernaut outfits @@ -508,35 +455,32 @@ l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd -/datum/outfit/job/vsd/juggernaut/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + backpack_contents = list( + /obj/item/storage/box/m94 = 1, + /obj/item/storage/box/MRE = 1, + /obj/item/reagent_containers/hypospray/autoinjector/combat = 2, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + /obj/item/ammo_magazine/rifle/vsd_mg = 5, + ) + + suit_contents = list( + /obj/item/explosive/grenade/vsd = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 2, + ) + + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/explosive/plastique = 1, + ) + + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 2, + ) /datum/outfit/job/vsd/eod name = "VSD Juggernaut" @@ -557,37 +501,33 @@ l_pocket = /obj/item/storage/pouch/explosive back = /obj/item/storage/backpack/lightpack/vsd -/datum/outfit/job/vsd/eod/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/storage/box/MRE = 1, + /obj/item/explosive/grenade/vsd = 4, + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + /obj/item/ammo_magazine/rocket/vsd/he = 2, + /obj/item/ammo_magazine/rocket/vsd/incendiary = 2, + ) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + suit_contents = list( + /obj/item/ammo_magazine/rocket/vsd/chemical = 2, + ) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_BACKPACK) + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/he, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/incendiary, SLOT_IN_L_POUCH) + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/explosive/plastique = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/chemical, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/vsd/chemical, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) + l_pocket_contents = list( + /obj/item/ammo_magazine/rocket/vsd/he = 2, + /obj/item/ammo_magazine/rocket/vsd/incendiary = 2, + ) //SL outfits @@ -604,27 +544,28 @@ l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd -/datum/outfit/job/vsd/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/vsd, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_ACCESSORY) - + backpack_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/explosive/plastique = 2, + /obj/item/tool/extinguisher/mini = 1, + /obj/item/storage/box/MRE = 1, + ) + + suit_contents = list( + /obj/item/explosive/grenade/vsd = 2, + ) + + head_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, + /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, + ) + + webbing_contents = list( + /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 2, + /obj/item/explosive/plastique = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + ) /datum/outfit/job/vsd/leader/one head = /obj/item/clothing/head/vsd/beret @@ -634,26 +575,19 @@ suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard belt = /obj/item/storage/holster/belt/pistol/standard_pistol -/datum/outfit/job/vsd/leader/one/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 4, + /obj/item/ammo_magazine/pistol/vsd_pistol = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + belt_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 6, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_rifle, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_rifle = 2, + ) /datum/outfit/job/vsd/leader/two head = /obj/item/clothing/head/helmet/marine/vsd @@ -663,27 +597,19 @@ suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut belt = /obj/item/storage/holster/belt/korovin -/datum/outfit/job/vsd/leader/two/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 3, + /obj/item/ammo_magazine/pistol/xmdivider = 4, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/xmdivider, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/xmdivider/gunslinger(H), SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/pistol/xmdivider = 6, + /obj/item/weapon/gun/pistol/xmdivider/gunslinger = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 2, + ) /datum/outfit/job/vsd/leader/upp_three head = /obj/item/clothing/head/uppcap/beret @@ -693,23 +619,16 @@ suit_store = /obj/item/weapon/gun/rifle/vsd_lmg/juggernaut belt = /obj/item/storage/holster/belt/pistol/standard_pistol -/datum/outfit/job/vsd/leader/upp_three/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BACKPACK) + backpack_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 3, + /obj/item/ammo_magazine/pistol/vsd_pistol = 2, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vsd_pistol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vsd_pistol/standard(H), SLOT_IN_BELT) + belt_contents = list( + /obj/item/ammo_magazine/pistol/vsd_pistol = 6, + /obj/item/weapon/gun/pistol/vsd_pistol/standard = 1, + ) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/vsd_mg, SLOT_IN_L_POUCH) + l_pocket_contents = list( + /obj/item/ammo_magazine/rifle/vsd_mg = 2, + ) From 5ff1f48010fae688eba5bbb232bf2405caf1a091 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Wed, 2 Oct 2024 17:01:18 +0200 Subject: [PATCH 05/17] It mostly works! --- code/__DEFINES/equipment.dm | 293 +++---- code/__DEFINES/is_helpers.dm | 2 +- code/__DEFINES/preferences.dm | 10 +- code/__HELPERS/pronouns.dm | 18 +- code/_onclick/hud/human.dm | 4 +- code/_onclick/hud/xeno/xeno.dm | 4 +- code/_onclick/telekinesis.dm | 8 +- code/datums/components/deployable_item.dm | 2 +- code/datums/components/harvester.dm | 2 +- code/datums/components/shield.dm | 6 +- code/datums/components/stun_mitigation.dm | 2 +- .../campaign/loadout_items/SOM/back_slot.dm | 2 +- .../campaign/loadout_items/SOM/belt.dm | 32 +- .../campaign/loadout_items/SOM/head.dm | 16 +- .../campaign/loadout_items/SOM/pockets.dm | 64 +- .../campaign/loadout_items/SOM/suit.dm | 56 +- .../SOM/suit_storage/engineer.dm | 208 ++--- .../SOM/suit_storage/field_commander.dm | 170 ++-- .../loadout_items/SOM/suit_storage/medic.dm | 154 ++-- .../SOM/suit_storage/squad_leader.dm | 122 +-- .../SOM/suit_storage/standard.dm | 302 +++---- .../loadout_items/SOM/suit_storage/veteran.dm | 322 ++++---- .../campaign/loadout_items/SOM/uniform.dm | 12 +- .../campaign/loadout_items/_TGMC/back_slot.dm | 38 +- .../campaign/loadout_items/_TGMC/belt.dm | 14 +- .../campaign/loadout_items/_TGMC/head.dm | 20 +- .../campaign/loadout_items/_TGMC/pockets.dm | 40 +- .../campaign/loadout_items/_TGMC/suit.dm | 66 +- .../loadout_items/_TGMC/suit_storage.dm | 24 +- .../_TGMC/suit_storage/corpsman.dm | 248 +++--- .../_TGMC/suit_storage/engineer.dm | 30 +- .../_TGMC/suit_storage/field_commander.dm | 318 ++++---- .../_TGMC/suit_storage/marine.dm | 756 +++++++++--------- .../_TGMC/suit_storage/smartgunner.dm | 86 +- .../_TGMC/suit_storage/squad_leader.dm | 368 ++++----- .../campaign/loadout_items/_TGMC/uniform.dm | 12 +- code/datums/jobs/job/job.dm | 4 +- code/datums/jobs/job/survivor.dm | 40 +- code/datums/jobs/squads.dm | 2 +- code/datums/loadout/loadout.dm | 10 +- code/datums/loadout/loadout_helper.dm | 4 +- code/datums/outfits/_outfit.dm | 28 +- code/datums/outfits/quick_load_outfits.dm | 12 +- code/datums/outfits/vv_outfit.dm | 2 +- .../effects/landmarks/corpsespawner.dm | 26 +- code/game/objects/items.dm | 71 +- code/game/objects/items/blink_drive.dm | 2 +- code/game/objects/items/handcuffs.dm | 2 +- code/game/objects/items/jetpack.dm | 2 +- code/game/objects/items/marine_gear.dm | 4 +- code/game/objects/items/megaphone.dm | 2 +- code/game/objects/items/radio/headset.dm | 2 +- code/game/objects/items/storage/backpack.dm | 6 +- code/game/objects/items/storage/belt.dm | 6 +- code/game/objects/items/storage/fancy.dm | 4 +- code/game/objects/items/storage/holsters.dm | 4 +- code/game/objects/items/storage/pouch.dm | 6 +- code/game/objects/machinery/OpTable.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/client/preferences_gear.dm | 84 +- code/modules/clothing/clothing.dm | 4 +- code/modules/clothing/glasses/glasses.dm | 6 +- code/modules/clothing/glasses/hud.dm | 2 +- code/modules/clothing/masks/gasmask.dm | 2 +- .../clothing/modular_armor/attachments.dm | 4 +- .../modular_armor/attachments/cape.dm | 2 +- .../modular_armor/attachments/modules.dm | 22 +- .../modules/clothing/modular_armor/modular.dm | 4 +- code/modules/clothing/suits/marine_armor.dm | 10 +- code/modules/clothing/suits/miscellaneous.dm | 2 +- code/modules/mob/inventory.dm | 8 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../mob/living/carbon/human/_species.dm | 72 +- .../living/carbon/human/human_attackhand.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 4 +- .../mob/living/carbon/human/inventory.dm | 66 +- .../human/species_types/combat_robots.dm | 14 +- .../carbon/human/species_types/zombies.dm | 8 +- code/modules/mob/living/carbon/inventory.dm | 8 +- .../castes/runner/abilities_runner.dm | 6 +- .../living/carbon/xenomorph/facehuggers.dm | 2 +- .../mob/living/carbon/xenomorph/saddles.dm | 6 +- code/modules/mob/mob.dm | 20 +- .../projectiles/gun_attachables/rail.dm | 2 +- code/modules/projectiles/gun_helpers.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/projectiles/guns/rifles.dm | 2 +- .../reagent_containers/food/snacks.dm | 2 +- .../vehicles/mecha/mecha_mob_interaction.dm | 2 +- 89 files changed, 2198 insertions(+), 2248 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index f24a23a3400ab..f2490a0c22228 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -226,6 +226,7 @@ #define ITEM_SLOT_HANDCUFF (1<<14) //the slot for handcuffs #define ITEM_SLOT_L_HAND (1<<15) //left hand #define ITEM_SLOT_R_HAND (1<<16) //right hand + #define ITEM_SLOT_HANDS (ITEM_SLOT_L_HAND|ITEM_SLOT_R_HAND) //a combo of the above #define ITEM_SLOT_ACTIVE_STORAGE (1<<17) // the currently open/active storage container ///Inventory slot bits to plain english strings @@ -307,101 +308,29 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define slot_s_store_str "slot_s_store" #define slot_l_store_str "slot_l_store" #define slot_r_store_str "slot_r_store" -#define slot_tie_str "slot_tie" ///Correspondance between slot strings and slot numbers +//ivan todo make sure webbings work with loadouts GLOBAL_LIST_INIT(slot_str_to_slot, list( - "slot_back" = SLOT_BACK, - "slot_l_hand" = SLOT_L_HAND, - "slot_r_hand" = SLOT_R_HAND, - "slot_w_uniform" = SLOT_W_UNIFORM, - "slot_head" = SLOT_HEAD, - "slot_suit" = SLOT_WEAR_SUIT, - "slot_ear" = SLOT_EARS, - "slot_belt" = SLOT_BELT, - "slot_shoes" = SLOT_SHOES, - "slot_wear_mask" = SLOT_WEAR_MASK, - "slot_handcuffed" = SLOT_HANDCUFFED, - "slot_wear_id" = SLOT_WEAR_ID, - "slot_gloves" = SLOT_GLOVES, - "slot_glasses" = SLOT_GLASSES, - "slot_s_store" = SLOT_S_STORE, - "slot_l_store" = SLOT_L_STORE, - "slot_r_store" = SLOT_R_STORE, - "slot_tie" = SLOT_ACCESSORY, + "slot_back" = ITEM_SLOT_BACK, + "slot_l_hand" = ITEM_SLOT_L_HAND, + "slot_r_hand" = ITEM_SLOT_R_HAND, + "slot_w_uniform" = ITEM_SLOT_ICLOTHING, + "slot_head" = ITEM_SLOT_HEAD, + "slot_suit" = ITEM_SLOT_OCLOTHING, + "slot_ear" = ITEM_SLOT_EARS, + "slot_belt" = ITEM_SLOT_BELT, + "slot_shoes" = ITEM_SLOT_FEET, + "slot_wear_mask" = ITEM_SLOT_MASK, + "slot_handcuffed" = ITEM_SLOT_HANDCUFF, + "slot_wear_id" = ITEM_SLOT_ID, + "slot_gloves" = ITEM_SLOT_GLOVES, + "slot_glasses" = ITEM_SLOT_EYES, + "slot_s_store" = ITEM_SLOT_SUITSTORE, + "slot_l_store" = ITEM_SLOT_L_POCKET, + "slot_r_store" = ITEM_SLOT_R_POCKET, )) -//I hate that this has to exist -/proc/slotdefine2slotbit(slotdefine) //Keep this up to date with the value of SLOT BITMASKS and SLOTS (the two define sections above) - . = 0 - switch(slotdefine) - if(SLOT_BACK) - . = ITEM_SLOT_BACK - if(SLOT_WEAR_MASK) - . = ITEM_SLOT_MASK - if(SLOT_BELT) - . = ITEM_SLOT_BELT - if(SLOT_WEAR_ID) - . = ITEM_SLOT_ID - if(SLOT_EARS) - . = ITEM_SLOT_EARS - if(SLOT_GLASSES) - . = ITEM_SLOT_EYES - if(SLOT_GLOVES) - . = ITEM_SLOT_GLOVES - if(SLOT_HEAD) - . = ITEM_SLOT_HEAD - if(SLOT_SHOES) - . = ITEM_SLOT_FEET - if(SLOT_WEAR_SUIT) - . = ITEM_SLOT_OCLOTHING - if(SLOT_S_STORE) - . = ITEM_SLOT_SUITSTORE - if(SLOT_W_UNIFORM) - . = ITEM_SLOT_ICLOTHING - if(SLOT_R_STORE) - . = ITEM_SLOT_R_POCKET - if(SLOT_L_STORE) - . = ITEM_SLOT_L_POCKET - -/proc/slotbit2slotdefine(slotbit) - . = 0 - switch(slotbit) - if(ITEM_SLOT_OCLOTHING) - . = SLOT_WEAR_SUIT - if(ITEM_SLOT_ICLOTHING) - . = SLOT_W_UNIFORM - if(ITEM_SLOT_GLOVES) - . = SLOT_GLOVES - if(ITEM_SLOT_EYES) - . = SLOT_GLASSES - if(ITEM_SLOT_EARS) - . = SLOT_EARS - if(ITEM_SLOT_MASK) - . = SLOT_WEAR_MASK - if(ITEM_SLOT_HEAD) - . = SLOT_HEAD - if(ITEM_SLOT_FEET) - . = SLOT_SHOES - if(ITEM_SLOT_ID) - . = SLOT_WEAR_ID - if(ITEM_SLOT_BELT) - . = SLOT_BELT - if(ITEM_SLOT_BACK) - . = SLOT_BACK - if(ITEM_SLOT_R_POCKET) - . = SLOT_R_STORE - if(ITEM_SLOT_L_POCKET) - . = SLOT_L_STORE - if(ITEM_SLOT_SUITSTORE) - . = SLOT_S_STORE - if(ITEM_SLOT_HANDCUFF) - . = SLOT_HANDCUFFED - if(ITEM_SLOT_L_HAND) - . = SLOT_L_HAND - if(ITEM_SLOT_R_HAND) - . = SLOT_R_HAND - //================================================= // bitflags for clothing parts //thermal_protection_flags @@ -470,113 +399,67 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( #define WEIGHT_CLASS_BULKY 4 //Items that can be weilded or equipped but not stored in an inventory, ex: Defibrillator, Backpack, Space Suits #define WEIGHT_CLASS_HUGE 5 //Usually represents objects that require two hands to operate, ex: Shotgun, Two Handed Melee Weapons #define WEIGHT_CLASS_GIGANTIC 6 //Essentially means it cannot be picked up or placed in an inventory, ex: Mech Parts, Safe - +// ivan todo uhh look at the blame #define SLOT_EQUIP_ORDER list(\ - SLOT_WEAR_ID,\ - SLOT_GLASSES,\ - SLOT_W_UNIFORM,\ - SLOT_ACCESSORY,\ - SLOT_WEAR_SUIT,\ - SLOT_WEAR_MASK,\ - SLOT_HEAD,\ - SLOT_SHOES,\ - SLOT_GLOVES,\ - SLOT_EARS,\ - SLOT_BELT,\ - SLOT_IN_BOOT,\ - SLOT_IN_L_POUCH,\ - SLOT_IN_R_POUCH,\ - SLOT_IN_HEAD,\ - SLOT_IN_ACCESSORY,\ - SLOT_IN_HOLSTER,\ - SLOT_IN_S_HOLSTER,\ - SLOT_IN_B_HOLSTER,\ - SLOT_BACK,\ - SLOT_S_STORE,\ - SLOT_L_STORE,\ - SLOT_R_STORE,\ - SLOT_IN_STORAGE,\ - SLOT_IN_SUIT,\ - SLOT_IN_BELT,\ - SLOT_IN_BACKPACK\ + ITEM_SLOT_ID,\ + ITEM_SLOT_EYES,\ + ITEM_SLOT_ICLOTHING,\ + ITEM_SLOT_OCLOTHING,\ + ITEM_SLOT_MASK,\ + ITEM_SLOT_HEAD,\ + ITEM_SLOT_FEET,\ + ITEM_SLOT_GLOVES,\ + ITEM_SLOT_EARS,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_BACK,\ + ITEM_SLOT_SUITSTORE,\ + ITEM_SLOT_L_POCKET,\ + ITEM_SLOT_R_POCKET,\ ) ///Each slot you can draw from, used and messed with in your preferences. #define SLOT_DRAW_ORDER list(\ - SLOT_IN_HOLSTER,\ - SLOT_IN_S_HOLSTER,\ - SLOT_IN_B_HOLSTER,\ - SLOT_IN_BACKPACK, \ - SLOT_IN_ACCESSORY,\ - SLOT_S_STORE,\ - SLOT_IN_L_POUCH,\ - SLOT_IN_R_POUCH,\ - SLOT_BELT,\ - SLOT_IN_BELT,\ - SLOT_WEAR_SUIT,\ - SLOT_IN_STORAGE,\ - SLOT_L_STORE,\ - SLOT_R_STORE,\ - SLOT_BACK,\ - SLOT_IN_BOOT,\ - SLOT_IN_HEAD\ + ITEM_SLOT_SUITSTORE,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_OCLOTHING,\ + ITEM_SLOT_ACTIVE_STORAGE,\ + ITEM_SLOT_L_POCKET,\ + ITEM_SLOT_R_POCKET,\ + ITEM_SLOT_BACK,\ ) #define SLOT_ALL list(\ - SLOT_WEAR_ID,\ - SLOT_EARS,\ - SLOT_W_UNIFORM,\ - SLOT_SHOES,\ - SLOT_GLOVES,\ - SLOT_BELT,\ - SLOT_WEAR_SUIT,\ - SLOT_GLASSES,\ - SLOT_WEAR_MASK,\ - SLOT_HEAD,\ - SLOT_BACK,\ - SLOT_L_STORE,\ - SLOT_R_STORE,\ - SLOT_ACCESSORY,\ - SLOT_S_STORE,\ - SLOT_L_HAND,\ - SLOT_R_HAND,\ - SLOT_HANDCUFFED,\ - SLOT_IN_BOOT,\ - SLOT_IN_BACKPACK,\ - SLOT_IN_SUIT,\ - SLOT_IN_ACCESSORY,\ - SLOT_IN_HOLSTER,\ - SLOT_IN_B_HOLSTER,\ - SLOT_IN_S_HOLSTER,\ - SLOT_IN_STORAGE,\ - SLOT_IN_L_POUCH,\ - SLOT_IN_R_POUCH,\ - SLOT_IN_HEAD,\ - SLOT_IN_BELT,\ + ITEM_SLOT_ID,\ + ITEM_SLOT_EARS,\ + ITEM_SLOT_ICLOTHING,\ + ITEM_SLOT_FEET,\ + ITEM_SLOT_GLOVES,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_OCLOTHING,\ + ITEM_SLOT_EYES,\ + ITEM_SLOT_MASK,\ + ITEM_SLOT_HEAD,\ + ITEM_SLOT_BACK,\ + ITEM_SLOT_L_POCKET,\ + ITEM_SLOT_R_POCKET,\ + ITEM_SLOT_SUITSTORE,\ + ITEM_SLOT_L_HAND,\ + ITEM_SLOT_R_HAND,\ + ITEM_SLOT_HANDCUFF,\ ) /// A list of equip slots that are valid for quick equip preferences #define VALID_EQUIP_SLOTS list(\ - SLOT_S_STORE,\ - SLOT_WEAR_SUIT,\ - SLOT_BELT,\ - SLOT_BACK,\ - SLOT_IN_BACKPACK,\ - SLOT_IN_BOOT,\ - SLOT_IN_HEAD,\ - SLOT_L_STORE,\ - SLOT_R_STORE,\ - SLOT_IN_ACCESSORY,\ - SLOT_IN_BELT,\ - SLOT_IN_HOLSTER,\ - SLOT_IN_S_HOLSTER,\ - SLOT_IN_B_HOLSTER,\ + ITEM_SLOT_SUITSTORE,\ + ITEM_SLOT_OCLOTHING,\ + ITEM_SLOT_ICLOTHING,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_BACK,\ + ITEM_SLOT_L_POCKET,\ + ITEM_SLOT_R_POCKET,\ + ITEM_SLOT_FEET,\ ) -#define ITEM_NOT_EQUIPPED 0 -#define ITEM_EQUIPPED_CARRIED 1 //To hands, a storage or the likes. -#define ITEM_EQUIPPED_WORN 2 //Actually worn on the body. - #define SLOT_FLUFF_DRAW list(\ "Suit Storage",\ "Suit Inside",\ @@ -596,25 +479,30 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( /proc/slot_fluff_to_flag(slot) switch(slot) if("Suit Storage") - return SLOT_S_STORE + return ITEM_SLOT_SUITSTORE if("Suit Inside") - return SLOT_WEAR_SUIT + return ITEM_SLOT_OCLOTHING if("Belt") - return SLOT_BELT + return ITEM_SLOT_BELT if("Back") - return SLOT_BACK + return ITEM_SLOT_BACK if("Boot") - return SLOT_IN_BOOT + return ITEM_SLOT_FEET + /* if("Backpack") return SLOT_IN_BACKPACK if("Helmet") return SLOT_IN_HEAD + */ if("Left Pocket") - return SLOT_L_STORE + return ITEM_SLOT_L_POCKET + /* // ivan todo if("Left Pocket Inside") return SLOT_IN_L_POUCH + */ if("Right Pocket") - return SLOT_R_STORE + return ITEM_SLOT_R_POCKET + /* if("Right Pocket Inside") return SLOT_IN_R_POUCH if("Webbing") @@ -627,33 +515,43 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( return SLOT_IN_S_HOLSTER if("Back Holster") return SLOT_IN_B_HOLSTER + */ if("Active Storage") - return SLOT_IN_STORAGE + return ITEM_SLOT_ACTIVE_STORAGE /proc/slot_flag_to_fluff(slot) switch(slot) - if(SLOT_S_STORE) + if(ITEM_SLOT_SUITSTORE) return "Suit Storage" + /* if(SLOT_WEAR_SUIT) return "Suit Inside" - if(SLOT_BELT) + */ + if(ITEM_SLOT_BELT) return "Belt" + /* if(SLOT_IN_BELT) return "Belt Inside" - if(SLOT_BACK) + */ + if(ITEM_SLOT_BACK) return "Back" - if(SLOT_IN_BOOT) + if(ITEM_SLOT_FEET) return "Boot" + /* if(SLOT_IN_BACKPACK) return "Backpack" if(SLOT_IN_HEAD) return "Helmet" - if(SLOT_L_STORE) + */ + if(ITEM_SLOT_L_POCKET) return "Left Pocket" + /* if(SLOT_IN_L_POUCH) return "Left Pocket Inside" - if(SLOT_R_STORE) + */ + if(ITEM_SLOT_POCKET) return "Right Pocket" + /* if(SLOT_IN_R_POUCH) return "Right Pocket Inside" if(SLOT_IN_ACCESSORY) @@ -666,4 +564,5 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( return "Back Holster" if(SLOT_IN_STORAGE) return "Active Storage" + */ diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 5c8737146170f..eb3c97a807327 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -318,7 +318,7 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur"))) #define isxenohive(A) ((A == XENO_HIVE_NONE) || (A == XENO_HIVE_NORMAL) || (A == XENO_HIVE_CORRUPTED) || (A == XENO_HIVE_ALPHA) || (A == XENO_HIVE_BETA) || (A == XENO_HIVE_ZETA) || (A == XENO_HIVE_ADMEME)) || (A == XENO_HIVE_FALLEN) // Slot helpers -#define ishandslot(A) ((A == SLOT_L_HAND) || (A == SLOT_R_HAND)) +#define ishandslot(A) (A & ITEM_SLOT_HANDS) // Objective helpers #define ismaroonobjective(O) (istype(O, /datum/objective/maroon)) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index bed73f19846a1..5802dabb07cad 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -185,11 +185,11 @@ ///The default Quick equip order list, adding/removing slots from this list will increase the amount of quick equip slots. Update the define above when #define QUICK_EQUIP_ORDER list(\ - SLOT_S_STORE,\ - SLOT_BELT,\ - SLOT_IN_BOOT,\ - SLOT_L_STORE,\ - SLOT_R_STORE\ + ITEM_SLOT_SUITSTORE,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_FEET,\ + ITEM_SLOT_L_POCKET,\ + ITEM_SLOT_R_POCKET\ ) #define BE_SPECIAL_FLAGS list(\ diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index 140baaac15a60..816e7014a2e6a 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -246,7 +246,7 @@ /mob/living/carbon/human/p_they(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -254,7 +254,7 @@ /mob/living/carbon/human/p_their(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -262,7 +262,7 @@ /mob/living/carbon/human/p_them(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -270,7 +270,7 @@ /mob/living/carbon/human/p_have(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -278,7 +278,7 @@ /mob/living/carbon/human/p_are(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -286,7 +286,7 @@ /mob/living/carbon/human/p_were(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -294,7 +294,7 @@ /mob/living/carbon/human/p_do(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -302,7 +302,7 @@ /mob/living/carbon/human/p_s(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() @@ -310,6 +310,6 @@ /mob/living/carbon/human/p_es(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((SLOT_W_UNIFORM & obscured) && skipface) + if((ITEM_SLOT_ICLOTHING & obscured) && skipface) temp_gender = PLURAL return ..() diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index f1e2a886ab4ec..fbbc94be443ad 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -90,7 +90,7 @@ inv_box = new /atom/movable/screen/inventory/hand/right(null, src) inv_box.icon = ui_style - inv_box.slot_id = SLOT_R_HAND + inv_box.slot_id = ITEM_SLOT_R_HAND inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.update_icon() @@ -100,7 +100,7 @@ inv_box = new /atom/movable/screen/inventory/hand/left(null, src) inv_box.setDir(EAST) inv_box.icon = ui_style - inv_box.slot_id = SLOT_L_HAND + inv_box.slot_id = ITEM_SLOT_L_HAND inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.update_icon() diff --git a/code/_onclick/hud/xeno/xeno.dm b/code/_onclick/hud/xeno/xeno.dm index 4380d1f191772..662da06edac28 100644 --- a/code/_onclick/hud/xeno/xeno.dm +++ b/code/_onclick/hud/xeno/xeno.dm @@ -71,7 +71,7 @@ inv_box = new /atom/movable/screen/inventory/hand/right(null, src) inv_box.icon = 'icons/mob/screen/alien.dmi' using.alpha = ui_alpha - inv_box.slot_id = SLOT_R_HAND + inv_box.slot_id = ITEM_SLOT_R_HAND inv_box.update_icon() r_hand_hud_object = inv_box static_inventory += inv_box @@ -79,7 +79,7 @@ inv_box = new /atom/movable/screen/inventory/hand/left(null, src) inv_box.icon = 'icons/mob/screen/alien.dmi' using.alpha = ui_alpha - inv_box.slot_id = SLOT_L_HAND + inv_box.slot_id = ITEM_SLOT_L_HAND inv_box.update_icon() l_hand_hud_object = inv_box static_inventory += inv_box diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 563d8cedd19f0..1b4ebde112e23 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -118,11 +118,9 @@ Redefine as needed. //stops TK grabs being equipped anywhere but into hands /obj/item/tk_grab/equipped(mob/user, slot) . = ..() - switch(slot) - if(SLOT_L_HAND, SLOT_R_HAND) - return - else - qdel(src) + if(slot & ITEM_SLOT_POCKET) + return + qdel(src) /obj/item/tk_grab/examine(user) diff --git a/code/datums/components/deployable_item.dm b/code/datums/components/deployable_item.dm index dd7d9f5f53ea7..2ef2aca3faf68 100644 --- a/code/datums/components/deployable_item.dm +++ b/code/datums/components/deployable_item.dm @@ -36,7 +36,7 @@ ///Register click signals to be ready for deploying /datum/component/deployable_item/proc/register_for_deploy_signal(obj/item/item_equipped, mob/user, slot) SIGNAL_HANDLER - if(slot != SLOT_L_HAND && slot != SLOT_R_HAND) + if(!(slot & ITEM_SLOT_HANDS)) return RegisterSignal(user, COMSIG_MOB_MOUSEDOWN, PROC_REF(deploy)) RegisterSignal(item_equipped, COMSIG_ITEM_UNEQUIPPED, PROC_REF(unregister_signals)) diff --git a/code/datums/components/harvester.dm b/code/datums/components/harvester.dm index bd96dfcca5185..216c3b9bb93e8 100644 --- a/code/datums/components/harvester.dm +++ b/code/datums/components/harvester.dm @@ -295,7 +295,7 @@ item_parent.update_appearance(UPDATE_ICON) loaded_reagent = null var/parent_slot = reagent_select_action.owner.get_equipped_slot(parent) - if(parent_slot == SLOT_L_HAND) + if(parent_slot & ITEM_SLOT_L_HAND) reagent_select_action.owner.update_inv_l_hand() else reagent_select_action.owner.update_inv_r_hand() diff --git a/code/datums/components/shield.dm b/code/datums/components/shield.dm index 831d1e58c07eb..d891439d379d6 100644 --- a/code/datums/components/shield.dm +++ b/code/datums/components/shield.dm @@ -10,7 +10,7 @@ ///Behavior flags var/shield_flags = NONE ///What slots the parent item provides its shield effects in - var/slot_flags = list(SLOT_L_HAND, SLOT_R_HAND) + var/slot_flags = ITEM_SLOT_HANDS ///Shield priority layer var/layer = 50 ///Is the shield currently active @@ -80,7 +80,7 @@ ///Handles equipping the shield /datum/component/shield/proc/shield_equipped(datum/source, mob/living/user, slot) SIGNAL_HANDLER - if(!(slot in slot_flags)) + if(!(slot & ITEM_SLOT_HANDS)) shield_detach_from_user() return shield_affect_user(user) @@ -209,7 +209,7 @@ /datum/component/shield/overhealth layer = 100 cover = list(MELEE = 0, BULLET = 80, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 0, ACID = 80) - slot_flags = list(SLOT_WEAR_SUIT) //For now it only activates while worn on a single place, meaning only one active at a time. Need to handle overlays properly to allow for stacking. + slot_flags = ITEM_SLOT_OCLOTHING //For now it only activates while worn on a single place, meaning only one active at a time. Need to handle overlays properly to allow for stacking. var/max_shield_integrity = 100 var/shield_integrity = 100 var/recharge_rate = 1 SECONDS diff --git a/code/datums/components/stun_mitigation.dm b/code/datums/components/stun_mitigation.dm index b931c7dd7d91b..e4f246fdee189 100644 --- a/code/datums/components/stun_mitigation.dm +++ b/code/datums/components/stun_mitigation.dm @@ -5,7 +5,7 @@ ///Any special behavior flags var/shield_flags = NONE ///The slots in which the parent can be in for the component to apply - var/slot_flags = SLOT_L_HAND|SLOT_R_HAND + var/slot_flags = ITEM_SLOT_HANDS ///Whether the component is currently active var/active = TRUE diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm index 53eb66b7b9d8e..071755204668d 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm @@ -67,7 +67,7 @@ /datum/loadout_item/back/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_R_HAND) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, ITEM_SLOT_R_HAND) /datum/loadout_item/back/som_rocket_bag name = "RPG bag" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm index 3728907e1a539..1d6cdee155304 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm @@ -41,15 +41,15 @@ /datum/loadout_item/belt/som_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BELT, FALSE, TRUE) /datum/loadout_item/belt/som_burst_pistol name = "V-11e" @@ -61,13 +61,13 @@ /datum/loadout_item/belt/som_burst_pistol/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(wearer), SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_SUITSTORE, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_SUITSTORE, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_SUITSTORE, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_SUITSTORE, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_SUITSTORE, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_SUITSTORE, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(wearer), ITEM_SLOT_SUITSTORE, FALSE, TRUE) /datum/loadout_item/belt/sawn_off name = "Sawn-off shotgun" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm index c407b13513d52..d8bbbcf34f290 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm @@ -9,8 +9,8 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/helmet/som_standard/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/som_veteran name = "Veteran helmet" @@ -59,16 +59,16 @@ loadout_item_flags = NONE /datum/loadout_item/helmet/som_tyr/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/som_tyr/engineer jobs_supported = list(SOM_SQUAD_ENGINEER) loadout_item_flags = NONE /datum/loadout_item/helmet/som_tyr/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/som_tyr/universal jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) @@ -90,5 +90,5 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/som_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm index 7ccee5f154565..dc13eb72848d8 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm @@ -48,12 +48,12 @@ item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) /datum/loadout_item/r_pocket/war_crime_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_R_POCKET, FALSE, TRUE) /datum/loadout_item/r_pocket/som_shotgun name = "Buckshot shells" @@ -63,10 +63,10 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/r_pocket/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) /datum/loadout_item/r_pocket/som_construction name = "Construction pouch" @@ -76,10 +76,10 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/r_pocket/som_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_R_POCKET, FALSE, TRUE) /datum/loadout_item/r_pocket/som_magazine name = "Mag pouch-P" @@ -162,12 +162,12 @@ item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) /datum/loadout_item/l_pocket/war_crime_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/som_shotgun name = "Flechette shells" @@ -177,10 +177,10 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/l_pocket/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/som_construction name = "Construction pouch" @@ -190,20 +190,20 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/l_pocket/som_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/som_construction/engineer desc = "A pouch containing additional metal, plasteel and barbed wire. Allows for the rapid establishment of fortified positions." jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/l_pocket/som_construction/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/som_magazine name = "Mag pouch-S" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm index c36f13b990475..50e69dad10473 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm @@ -21,19 +21,19 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/som_light_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_light_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/som/light/shield_overclocked/engineer jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/suit_slot/som_light_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_light_shield/overclocked/veteran jobs_supported = list(SOM_SQUAD_VETERAN) @@ -59,19 +59,19 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/som_medium_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_medium_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/som/shield_overclocked/engineer jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/suit_slot/som_medium_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_heavy_shield name = "H Aegis armor" @@ -132,8 +132,8 @@ item_whitelist = null /datum/loadout_item/suit_slot/som_heavy_tyr/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_heavy_tyr/engineer item_typepath = /obj/item/clothing/suit/modular/som/heavy/lorica/engineer @@ -142,11 +142,11 @@ item_whitelist = null /datum/loadout_item/suit_slot/som_heavy_tyr/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_heavy_tyr/universal jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) @@ -191,11 +191,11 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/som_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_engineer/light name = "L armor" @@ -213,8 +213,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/som_medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/som_medic/light name = "L armor" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm index bfef13b955836..a24b6b5bfab81 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm @@ -2,11 +2,11 @@ jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/suit_store/main_gun/som_engineer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle name = "V-31" @@ -21,27 +21,27 @@ /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/enhanced name = "V-31+" @@ -63,20 +63,20 @@ /datum/loadout_item/suit_store/main_gun/som_engineer/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/carbine name = "V-34" @@ -89,20 +89,20 @@ /datum/loadout_item/suit_store/main_gun/som_engineer/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/smg name = "V-21" @@ -116,27 +116,27 @@ /datum/loadout_item/suit_store/main_gun/som_engineer/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/smg/enhanced name = "V-21+" @@ -158,27 +158,27 @@ /datum/loadout_item/suit_store/main_gun/som_engineer/flechette_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/flechette_shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_engineer/volkite_charger name = "VX-32 charger" @@ -194,17 +194,17 @@ /datum/loadout_item/suit_store/main_gun/som_engineer/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm index c02b3859c441d..41d15f974870d 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm @@ -7,19 +7,19 @@ return if(istype(wearer.back, /obj/item/storage)) if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) else //else we put the sidearm in the bag - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom(wearer), ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/standard_rifle name = "V-31" @@ -36,15 +36,15 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/smg name = "V-21" @@ -60,16 +60,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_charger name = "VX-32 charger" @@ -85,14 +85,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_caliver name = "VX-33 caliver" @@ -109,14 +109,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/mpi name = "MPi-KM" @@ -131,14 +131,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_field_commander/carbine name = "V-34" @@ -154,14 +154,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/fc_boarding_axe name = "Boarding axe" @@ -174,32 +174,32 @@ jobs_supported = list(SOM_FIELD_COMMANDER) /datum/loadout_item/suit_store/fc_boarding_axe/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom(wearer), SLOT_IN_BACKPACK) - - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm index fc6c7cb953369..b0144d864efa6 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm @@ -14,19 +14,19 @@ /datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/enhanced name = "V-31+" @@ -48,18 +48,18 @@ /datum/loadout_item/suit_store/main_gun/som_medic/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_medic/carbine name = "V-34" @@ -72,18 +72,18 @@ /datum/loadout_item/suit_store/main_gun/som_medic/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_medic/smg name = "V-21" @@ -97,20 +97,20 @@ /datum/loadout_item/suit_store/main_gun/som_medic/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_medic/smg/enhanced name = "V-21+" @@ -132,20 +132,20 @@ /datum/loadout_item/suit_store/main_gun/som_medic/flechette_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_medic/volkite_charger name = "VX-32 charger" @@ -161,15 +161,15 @@ /datum/loadout_item/suit_store/main_gun/som_medic/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm index 90f48d9835bdb..cae1c45175a3c 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm @@ -7,19 +7,19 @@ return if(istype(wearer.back, /obj/item/storage)) if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) else //else we put the sidearm in the bag - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(wearer), ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/standard_rifle name = "V-31" @@ -36,15 +36,15 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/smg name = "V-21" @@ -60,16 +60,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_charger name = "VX-32 charger" @@ -85,14 +85,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_caliver name = "VX-33 caliver" @@ -109,14 +109,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/mpi name = "MPi-KM" @@ -131,14 +131,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_squad_leader/carbine name = "V-34" @@ -154,11 +154,11 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm index 2440ce581ad30..2c5d8d39ca47d 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm @@ -8,19 +8,19 @@ if(!isstorageobj(wearer.back)) return if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) else //else we put the sidearm in the bag - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(wearer), ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle name = "V-31" @@ -38,21 +38,21 @@ if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced name = "V-31+" @@ -65,7 +65,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return ..() /datum/loadout_item/suit_store/main_gun/som_marine/mpi_grenadier @@ -80,14 +80,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/carbine name = "V-34" @@ -102,14 +102,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/smg name = "V-21" @@ -130,23 +130,23 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced name = "V-21+" @@ -159,7 +159,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/smg/som/ap /datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return ..() /datum/loadout_item/suit_store/main_gun/som_marine/standard_shotgun @@ -179,22 +179,22 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/flamer name = "V-62 incinerator" @@ -209,20 +209,20 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield name = "V-21 & riot shield" @@ -235,31 +235,31 @@ item_typepath = /obj/item/weapon/gun/smg/som/one_handed /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, ITEM_SLOT_L_HAND) if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) return ..() //we explicitly don't want a sidearm for this weapon choice /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/enhanced name = "V-21+ & riot shield" @@ -282,20 +282,20 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/machinegunner/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger name = "VX-32 charger" @@ -313,21 +313,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/boarding_axe name = "Boarding axe" @@ -342,30 +342,30 @@ jobs_supported = list(SOM_SQUAD_MARINE) /datum/loadout_item/suit_store/boarding_axe/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle name = "V-31-suppressed" @@ -382,21 +382,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced name = "V-31-suppressed+" @@ -410,5 +410,5 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return ..() diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm index 5680dcf750922..1867d21734f62 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm @@ -7,19 +7,19 @@ return if(istype(wearer.back, /obj/item/storage)) if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) else //else we put the sidearm in the bag - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(wearer), ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle name = "V-31" @@ -36,23 +36,23 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/smg name = "V-21" @@ -68,23 +68,23 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/breacher name = "VX-32B charger" @@ -98,30 +98,30 @@ purchase_cost = 60 /datum/loadout_item/suit_store/main_gun/som_veteran/breacher/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, ITEM_SLOT_L_HAND) if(istype(wearer.back, /obj/item/storage)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) return ..() /datum/loadout_item/suit_store/main_gun/som_veteran/breacher/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger name = "VX-32 charger" @@ -137,22 +137,22 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver name = "VX-33 caliver" @@ -168,22 +168,22 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/mpi name = "MPi-KM" @@ -198,14 +198,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/carbine name = "V-34" @@ -221,14 +221,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver_pack name = "VX-33P Caliver" @@ -245,16 +245,16 @@ item_whitelist = list(/obj/item/cell/lasgun/volkite/powerpack = ITEM_SLOT_BACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver_pack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(istype(wearer.belt, /obj/item/weapon/gun/shotgun/double/sawn)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_culverin name = "VX-42 culverin" @@ -272,16 +272,16 @@ item_whitelist = list(/obj/item/cell/lasgun/volkite/powerpack = ITEM_SLOT_BACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_culverin/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(istype(wearer.belt, /obj/item/weapon/gun/shotgun/double/sawn)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/som_veteran/radioactive_smg name = "V-21R" @@ -297,45 +297,45 @@ secondary_ammo_type = /obj/item/ammo_magazine/smg/som/rad /datum/loadout_item/suit_store/main_gun/som_veteran/radioactive_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_L_POCKET, FALSE, TRUE) if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_R_POCKET, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/energy_sword name = "Energy sword" @@ -346,28 +346,28 @@ jobs_supported = list(SOM_SQUAD_VETERAN) /datum/loadout_item/suit_store/energy_sword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm index 6d0547e6422ec..db8cbab16785d 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm @@ -28,12 +28,12 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/uniform/som_medic/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/roller, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, ITEM_SLOT_ICLOTHING, FALSE, TRUE) //engineer /datum/loadout_item/uniform/som_engineer diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm index 0c055b7edc1d7..603032e6f03ce 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm @@ -95,7 +95,7 @@ /datum/loadout_item/back/marine_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_R_HAND) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, ITEM_SLOT_R_HAND) /datum/loadout_item/back/tgmc_heam_rocket_bag name = "HEAM rocket bag" @@ -142,12 +142,12 @@ /datum/loadout_item/back/engineerpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/back/tgmc_rocket_bag name = "Rocket bag" @@ -167,18 +167,18 @@ /datum/loadout_item/back/tech_backpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/minelayer, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/minelayer, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, FALSE, TRUE) //smartgunner /datum/loadout_item/back/sg_minigun_powerpack diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm index 7846620c80474..4326cf5b78c6b 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm @@ -78,18 +78,18 @@ ) /datum/loadout_item/belt/smg_holster/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(wearer), SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(wearer), ITEM_SLOT_SUITSTORE, FALSE, TRUE) var/ammo_type = /obj/item/ammo_magazine/smg/m25 if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) if(wearer.skills.getRating(SKILL_SMGS) >= SKILL_SMGS_TRAINED) ammo_type = /obj/item/ammo_magazine/smg/m25/ap if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/belt/machete name = "Machete" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm index f97d1e98709c4..a5dda6d76049b 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm @@ -3,8 +3,8 @@ ui_icon = "helmet" /datum/loadout_item/helmet/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/empty name = "no helmet" @@ -75,16 +75,16 @@ loadout_item_flags = NONE /datum/loadout_item/helmet/tyr/corpsman/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/tyr/engineer jobs_supported = list(SQUAD_ENGINEER) loadout_item_flags = NONE /datum/loadout_item/helmet/tyr/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/tyr/universal jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) @@ -105,8 +105,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/mimir/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/engineer name = "M10X-W helmet" @@ -116,8 +116,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, FALSE, TRUE) /datum/loadout_item/helmet/field_commander_beret name = "FC beret" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm index b437f2cad61a7..a466c28e5cec6 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm @@ -75,10 +75,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/r_pocket/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, FALSE, TRUE) /datum/loadout_item/r_pocket/marine_construction name = "Construction pouch" @@ -88,10 +88,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/r_pocket/marine_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_R_POCKET, FALSE, TRUE) /datum/loadout_item/r_pocket/magazine name = "Mag pouch-P" @@ -197,10 +197,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/l_pocket/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/marine_construction name = "Construction pouch" @@ -210,20 +210,20 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/l_pocket/marine_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/marine_construction/engineer desc = "A pouch containing additional metal, plasteel and barbed wire. Allows for the rapid establishment of fortified positions." jobs_supported = list(SQUAD_ENGINEER) /datum/loadout_item/l_pocket/marine_construction/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, FALSE, TRUE) /datum/loadout_item/l_pocket/magazine name = "Mag pouch-S" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm index e173fb2cc9a88..14e75d0b9304e 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm @@ -2,11 +2,11 @@ item_slot = ITEM_SLOT_OCLOTHING /datum/loadout_item/suit_slot/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/empty name = "no suit" @@ -51,19 +51,19 @@ jobs_supported = list(SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/light_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/light_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked/engineer jobs_supported = list(SQUAD_ENGINEER) /datum/loadout_item/suit_slot/light_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/medium_shield name = "M shield armor" @@ -83,19 +83,19 @@ jobs_supported = list(SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/medium_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/medium_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/xenonauten/shield_overclocked/engineer jobs_supported = list(SQUAD_ENGINEER) /datum/loadout_item/suit_slot/medium_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/heavy_shield name = "H shield armor" @@ -145,8 +145,8 @@ item_whitelist = null /datum/loadout_item/suit_slot/heavy_tyr/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/heavy_tyr/engineer item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/tyr_two/engineer @@ -155,11 +155,11 @@ item_whitelist = null /datum/loadout_item/suit_slot/heavy_tyr/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) /datum/loadout_item/suit_slot/heavy_tyr/universal jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) @@ -197,8 +197,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/medium_mimir/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, FALSE, TRUE) //engineer /datum/loadout_item/suit_slot/medium_engineer @@ -210,8 +210,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/medium_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, ITEM_SLOT_OCLOTHING, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm index 16763361215f4..f9a3c46ad90b9 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm @@ -45,17 +45,17 @@ if(!ammo_type) return if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm index dc402357c98b7..50aff667706e1 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm @@ -13,19 +13,19 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/laser_rifle name = "Laser rifle" @@ -39,18 +39,18 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/auto_shotgun name = "SH-15" @@ -65,19 +65,19 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/skirmish_rifle name = "AR-21" @@ -91,20 +91,20 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/standard_smg name = "SMG-25" @@ -117,21 +117,21 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/standard_smg/enhanced name = "SMG-25+" @@ -151,20 +151,20 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/carbine/enhanced name = "AR-18+" @@ -185,20 +185,20 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/enhanced name = "AR-12+" @@ -220,19 +220,19 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/plasma_smg name = "PL-51" @@ -248,19 +248,19 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/corpsman/plasma_rifle name = "PL-38" @@ -276,16 +276,16 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm index b66a49291046c..dcbe860427f39 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm @@ -2,11 +2,11 @@ jobs_supported = list(SQUAD_ENGINEER) /datum/loadout_item/suit_store/main_gun/engineer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/engineer/carbine name = "AR-18" @@ -33,11 +33,11 @@ /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/enhanced name = "AR-12+" @@ -57,11 +57,11 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette /datum/loadout_item/suit_store/main_gun/engineer/auto_shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/engineer/combat_rifle name = "AR-11" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm index 6212a62d5a175..7f165bba310f0 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm @@ -7,28 +7,28 @@ jobs_supported = list(FIELD_COMMANDER) /datum/loadout_item/suit_store/officer_sword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/fc_pistol name = "P-1911A1-C pistol" @@ -39,28 +39,28 @@ jobs_supported = list(FIELD_COMMANDER) /datum/loadout_item/suit_store/fc_pistol/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander jobs_supported = list(FIELD_COMMANDER) @@ -68,12 +68,12 @@ /datum/loadout_item/suit_store/main_gun/field_commander/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() if(loadout.belt == /obj/item/storage/belt/marine) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, ITEM_SLOT_BACK, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/pulse_rifle name = "PR-11" desc = "Equipped with a red dot sight, extended barrel and integrated underbarrel grenade launcher. The PR-11 is a relic from an earlier time. \ @@ -84,24 +84,24 @@ /datum/loadout_item/suit_store/main_gun/field_commander/pulse_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/combat_rifle name = "AR-11" @@ -113,24 +113,24 @@ /datum/loadout_item/suit_store/main_gun/field_commander/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/laser_rifle name = "Laser rifle" @@ -142,24 +142,24 @@ /datum/loadout_item/suit_store/main_gun/field_commander/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/laser_mg name = "Laser machinegun" @@ -171,24 +171,24 @@ /datum/loadout_item/suit_store/main_gun/field_commander/laser_mg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle name = "AR-12" @@ -200,27 +200,27 @@ /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/enhanced name = "AR-12+" @@ -239,27 +239,27 @@ /datum/loadout_item/suit_store/main_gun/field_commander/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/carbine/enhanced name = "AR-18+" @@ -280,24 +280,24 @@ /datum/loadout_item/suit_store/main_gun/field_commander/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle name = "PL-38" @@ -311,21 +311,21 @@ /datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm index 8a34ef9ef1597..143beb417fedd 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm @@ -2,11 +2,11 @@ jobs_supported = list(SQUAD_MARINE) /datum/loadout_item/suit_store/main_gun/marine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_rifle name = "AR-12" @@ -21,17 +21,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced name = "AR-12+" @@ -42,7 +42,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap /datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return ..() /datum/loadout_item/suit_store/main_gun/marine/laser_rifle @@ -57,23 +57,23 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_laser_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_carbine name = "AR-18" @@ -86,17 +86,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced name = "AR-18+" @@ -106,7 +106,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap /datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return ..() /datum/loadout_item/suit_store/main_gun/marine/combat_rifle @@ -121,24 +121,24 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/combat_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/battle_rifle name = "BR-64" @@ -151,17 +151,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/skirmish_rifle name = "AR-21" @@ -175,17 +175,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/alf name = "ALF-51B" @@ -199,25 +199,25 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/alf/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_gpmg name = "MG-60" @@ -230,27 +230,27 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_gpmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_mmg name = "MG-27" @@ -264,39 +264,39 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(istype(wearer.belt, /obj/item/storage/holster/m25)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_mmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(istype(wearer.belt, /obj/item/storage/holster/m25)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else if(isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/laser_mg name = "Laser machinegun" @@ -310,23 +310,23 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/laser_mg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/flamer name = "FL-84" @@ -342,39 +342,39 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(istype(wearer.belt, /obj/item/storage/holster/m25)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(istype(wearer.belt, /obj/item/storage/holster/m25)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else if(isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/shotgun @@ -390,26 +390,26 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/auto_shotgun name = "SH-15" @@ -424,17 +424,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/laser_carbine name = "Laser carbine" @@ -448,25 +448,25 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/laser_carbine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/scout_carbine name = "AR-18-scout" @@ -485,28 +485,28 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/scout_carbine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(istype(wearer.back, /obj/item/storage)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/scout_carbine/enhanced name = "AR-18-S+" @@ -528,21 +528,21 @@ /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, ITEM_SLOT_L_HAND) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/enhanced name = "SMG-25+ & riot shield" @@ -564,27 +564,27 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) if(istype(wearer.belt, /obj/item/storage/belt)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/standard_smg/enhanced name = "SMG-25+" @@ -612,32 +612,32 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/scanner(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/scanner(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/scout_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, SLOT_IN_BELT) - - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, ITEM_SLOT_BELT, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine name = "AR-18-Suppressed" @@ -651,17 +651,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced name = "AR-18-Suppressed+" @@ -672,7 +672,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return ..() /datum/loadout_item/suit_store/machete_shield @@ -686,31 +686,31 @@ /datum/loadout_item/suit_store/machete_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, ITEM_SLOT_L_HAND) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/mag_gl name = "GL-54" @@ -726,31 +726,31 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/dense, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/razor, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/dense, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/razor, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/mag_gl/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/plasma_smg name = "PL-51" @@ -766,24 +766,24 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/plasma_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/plasma_rifle name = "PL-38" @@ -799,24 +799,24 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/plasma_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/plasma_cannon name = "PL-96" @@ -833,20 +833,20 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/marine/plasma_cannon/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm index 36e3535edc7b4..5a95a9e2dd379 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm @@ -13,24 +13,24 @@ /datum/loadout_item/suit_store/main_gun/smartgunner/smartmachinegun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/smartgunner/smart_minigun name = "SG-85" @@ -44,22 +44,22 @@ /datum/loadout_item/suit_store/main_gun/smartgunner/smart_minigun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() if(loadout.belt == /obj/item/storage/belt/sparepouch) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) else - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/smartgunner/smarttargetrifle name = "SG-62" @@ -71,25 +71,25 @@ /datum/loadout_item/suit_store/main_gun/smartgunner/smarttargetrifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm index eb5a4ae708439..bf0ffc90ec454 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm @@ -11,27 +11,27 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/enhanced name = "AR-12+" @@ -52,27 +52,27 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/carbine name = "AR-18" @@ -83,27 +83,27 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/carbine/enhanced name = "AR-18+" @@ -122,27 +122,27 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/battle_rifle name = "BR-64" @@ -153,26 +153,26 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/battle_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/auto_shotgun name = "SH-15" @@ -185,27 +185,27 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/oicw name = "AR-55" @@ -220,40 +220,40 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/oicw/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/oicw/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) if(loadout.belt == /obj/item/storage/belt/marine) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BELT, FALSE, TRUE) if(loadout.l_pocket == /obj/item/storage/pouch/magazine/large) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_L_POCKET, FALSE, TRUE) if(loadout.r_pocket == /obj/item/storage/pouch/magazine/large) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_R_POCKET, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg name = "SMG-25" @@ -265,32 +265,32 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() if(!isstorageobj(wearer.back)) //bruh - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/enhanced name = "SMG-25+" @@ -311,27 +311,27 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) /datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle name = "PL-38" @@ -345,24 +345,24 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, FALSE, TRUE) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm index 61b4991c8c929..5ef32eb54f6a3 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm @@ -79,12 +79,12 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/uniform/marine_corpsman/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/roller, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, ITEM_SLOT_ICLOTHING, FALSE, TRUE) //engineer /datum/loadout_item/uniform/marine_engineer diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm index d4a07eed94916..a08c5419e6f0f 100644 --- a/code/datums/jobs/job/job.dm +++ b/code/datums/jobs/job/job.dm @@ -285,7 +285,7 @@ GLOBAL_PROTECT(exp_specialmap) if(!admin_action) stack_trace("[src] had an ID when apply_outfit_to_spawn() ran") QDEL_NULL(wear_id) - equip_to_slot_or_del(id_card, SLOT_WEAR_ID) + equip_to_slot_or_del(id_card, ITEM_SLOT_ID) if(player && isnull(job.outfit.back) && player.prefs.backpack > BACK_NOTHING) var/obj/item/storage/backpack/new_backpack @@ -294,7 +294,7 @@ GLOBAL_PROTECT(exp_specialmap) new_backpack = new /obj/item/storage/backpack/marine(src) if(BACK_SATCHEL) new_backpack = new /obj/item/storage/backpack/marine/satchel(src) - equip_to_slot_or_del(new_backpack, SLOT_BACK) + equip_to_slot_or_del(new_backpack, ITEM_SLOT_BACK) job.outfit.handle_id(src, player) diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm index 7d5ba4a276471..8d9ebc0c99a0c 100644 --- a/code/datums/jobs/job/survivor.dm +++ b/code/datums/jobs/job/survivor.dm @@ -7,30 +7,30 @@ skills_type = /datum/skills/civilian/survivor faction = FACTION_TERRAGOV -/datum/job/survivor/after_spawn(mob/living/carbon/C, mob/M, latejoin = FALSE) +/datum/job/survivor/after_spawn(mob/living/carbon/spawned_carbon, mob/M, latejoin = FALSE) . = ..() - + //todo this should be handled better if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - C.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(C), SLOT_HEAD) - C.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit(C), SLOT_WEAR_SUIT) - C.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather(C), SLOT_WEAR_MASK) - C.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(C), SLOT_SHOES) - C.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(C), SLOT_GLOVES) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(spawned_carbon), ITEM_SLOT_HEAD) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit(spawned_carbon), ITEM_SLOT_OCLOTHING) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather(spawned_carbon), ITEM_SLOT_MASK) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(spawned_carbon), ITEM_SLOT_FEET) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(spawned_carbon), ITEM_SLOT_GLOVES) var/weapons = pick(SURVIVOR_WEAPONS) - var/obj/item/weapon/W = weapons[1] - var/obj/item/ammo_magazine/A = weapons[2] - C.equip_to_slot_or_del(new /obj/item/belt_harness(C), SLOT_BELT) - C.put_in_hands(new W(C)) - C.equip_to_slot_or_del(new A(C), SLOT_IN_BACKPACK) - C.equip_to_slot_or_del(new A(C), SLOT_IN_BACKPACK) - C.equip_to_slot_or_del(new A(C), SLOT_IN_BACKPACK) - - C.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(C), SLOT_GLASSES) - C.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(C), SLOT_R_STORE) - C.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(C), SLOT_L_STORE) - C.equip_to_slot_or_del(new /obj/item/weapon/combat_knife(C), SLOT_IN_BACKPACK) - C.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/rugged(C), SLOT_HEAD) + var/obj/item/weapon/picked_weapon = weapons[1] + var/obj/item/ammo_magazine/picked_ammo = weapons[2] + spawned_carbon.equip_to_slot_or_del(new /obj/item/belt_harness(spawned_carbon), ITEM_SLOT_BELT) + spawned_carbon.put_in_hands(new picked_weapon(spawned_carbon)) + spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) + spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) + spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) + spawned_carbon.equip_to_slot_or_del(new /obj/item/weapon/combat_knife(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) + + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(spawned_carbon), ITEM_SLOT_EYES) + spawned_carbon.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(spawned_carbon), ITEM_SLOT_R_POCKET) + spawned_carbon.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(spawned_carbon), ITEM_SLOT_L_POCKET) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/rugged(spawned_carbon), ITEM_SLOT_HEAD) switch(SSmapping.configs[GROUND_MAP].map_name) if(MAP_PRISON_STATION) diff --git a/code/datums/jobs/squads.dm b/code/datums/jobs/squads.dm index 42698129189bc..548e700a14610 100644 --- a/code/datums/jobs/squads.dm +++ b/code/datums/jobs/squads.dm @@ -202,7 +202,7 @@ if(new_squaddie.wear_ear) new_squaddie.dropItemToGround(new_squaddie.wear_ear) headset = new() - new_squaddie.equip_to_slot_or_del(headset, SLOT_EARS) + new_squaddie.equip_to_slot_or_del(headset, ITEM_SLOT_EARS) if(istype(headset)) headset.set_frequency(radio_freq) diff --git a/code/datums/loadout/loadout.dm b/code/datums/loadout/loadout.dm index 89f3570107461..f31326cd2f11a 100644 --- a/code/datums/loadout/loadout.dm +++ b/code/datums/loadout/loadout.dm @@ -37,7 +37,7 @@ if(slot_belt_str) if(!(equip_slot_flags & ITEM_SLOT_BELT)) return FALSE - if(!item_list[SLOT_W_UNIFORM]) + if(!item_list[ITEM_SLOT_ICLOTHING]) return FALSE return TRUE if(slot_glasses_str) @@ -47,19 +47,19 @@ if(slot_w_uniform_str) return (equip_slot_flags & ITEM_SLOT_ICLOTHING) if(slot_l_store_str) - if(!item_list[SLOT_W_UNIFORM]) + if(!item_list[ITEM_SLOT_ICLOTHING]) return FALSE if(w_class <= 2 || (equip_slot_flags & ITEM_SLOT_POCKET)) return TRUE if(slot_r_store_str) - if(!item_list[SLOT_W_UNIFORM]) + if(!item_list[ITEM_SLOT_ICLOTHING]) return FALSE if(w_class <= 2 || (equip_slot_flags & ITEM_SLOT_POCKET)) return TRUE if(slot_s_store_str) - if(!item_list[SLOT_W_UNIFORM]) + if(!item_list[ITEM_SLOT_ICLOTHING]) return FALSE - var/obj/item/jumpsuit = item_list[SLOT_W_UNIFORM] + var/obj/item/jumpsuit = item_list[ITEM_SLOT_ICLOTHING] if(!jumpsuit.allowed) return FALSE if(jumpsuit.allowed.Find(item_type)) diff --git a/code/datums/loadout/loadout_helper.dm b/code/datums/loadout/loadout_helper.dm index f25ea448920d1..85b48d519d988 100644 --- a/code/datums/loadout/loadout_helper.dm +++ b/code/datums/loadout/loadout_helper.dm @@ -124,11 +124,11 @@ if(user.wear_ear) return if(user.job.outfit.ears) - user.equip_to_slot_or_del(new user.job.outfit.ears(user), SLOT_EARS, override_nodrop = TRUE) + user.equip_to_slot_or_del(new user.job.outfit.ears(user), ITEM_SLOT_EARS, override_nodrop = TRUE) return if(!user.assigned_squad) return - user.equip_to_slot_or_del(new /obj/item/radio/headset/mainship/marine(null, user.assigned_squad, user.job.type), SLOT_EARS, override_nodrop = TRUE) + user.equip_to_slot_or_del(new /obj/item/radio/headset/mainship/marine(null, user.assigned_squad, user.job.type), ITEM_SLOT_EARS, override_nodrop = TRUE) /// Will check if the selected category can be bought according to the category choices left /proc/can_buy_category(category, category_choices) diff --git a/code/datums/outfits/_outfit.dm b/code/datums/outfits/_outfit.dm index d097a08d958fc..cad8337bb734e 100644 --- a/code/datums/outfits/_outfit.dm +++ b/code/datums/outfits/_outfit.dm @@ -90,14 +90,14 @@ /datum/outfit/New() . = ..() - container_list += backpack_contents - container_list += belt_contents - container_list += shoe_contents - container_list += suit_contents - container_list += webbing_contents - container_list += head_contents - container_list += r_pocket_contents - container_list += l_pocket_contents + container_list["slot_back"] = backpack_contents + container_list["slot_belt"] = belt_contents + container_list["slot_shoes"] = shoe_contents + container_list["slot_suit"] = suit_contents + container_list["slot_w_uniform"] = webbing_contents + container_list["slot_head"] = head_contents + container_list["slot_r_store"] = r_pocket_contents + container_list["slot_l_store"] = l_pocket_contents /// This gets ran before we equip any items from the variables /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -151,16 +151,14 @@ if(r_pocket) equipping_human.equip_to_slot_or_del(new r_pocket(equipping_human), ITEM_SLOT_R_POCKET, override_nodrop = TRUE) - for(var/list/content_list in container_list) // ivan todo make sure to test this - if(!length(content_list)) - continue - for(var/path in content_list) - var/number = content_list[path] + for(var/slot in container_list) + for(var/path in container_list[slot]) + var/number = container_list[slot][path] if(!isnum(number))//Default to 1 number = 1 for(var/i in 1 to number) - if(!equipping_human.equip_to_slot_or_del(new path(equipping_human), ITEM_SLOT_BACK, TRUE, TRUE)) - stack_trace("Failed to place item of type [path] from list [vars["[content_list]"]] in outfit of type [type]!") + if(!equipping_human.equip_to_slot_or_del(new path(equipping_human), GLOB.slot_str_to_slot[slot], TRUE, TRUE)) + stack_trace("Failed to place item of type [path] from list in slot [slot] in outfit of type [type]!") post_equip(equipping_human, visualsOnly) diff --git a/code/datums/outfits/quick_load_outfits.dm b/code/datums/outfits/quick_load_outfits.dm index a33faa65fdcf3..03847d1f84940 100644 --- a/code/datums/outfits/quick_load_outfits.dm +++ b/code/datums/outfits/quick_load_outfits.dm @@ -864,8 +864,8 @@ ) /datum/outfit/quick/tgmc/leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() //ivan todo - H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) + . = ..() + H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) /datum/outfit/quick/tgmc/leader/standard_carbine name = "AR-18 Patrol Leader" @@ -919,8 +919,8 @@ ) /datum/outfit/quick/tgmc/leader/combat_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() //ivan todo - H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) + . = ..() + H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) /datum/outfit/quick/tgmc/leader/standard_battlerifle name = "BR-64 Patrol Leader" @@ -998,8 +998,8 @@ ) /datum/outfit/quick/tgmc/leader/standard_laserrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() //ivan todo - H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) + . = ..() + H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) /datum/outfit/quick/tgmc/leader/oicw name = "AR-55 Patrol Leader" diff --git a/code/datums/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm index 33309ada5818c..b249ff73a9203 100644 --- a/code/datums/outfits/vv_outfit.dm +++ b/code/datums/outfits/vv_outfit.dm @@ -25,7 +25,7 @@ for(var/vname in edits) I.vv_edit_var(vname,edits[vname]) //Apply access - var/obj/item/id_slot = H.get_item_by_slot(SLOT_WEAR_ID) + var/obj/item/id_slot = H.get_item_by_slot(ITEM_SLOT_ID) if(id_slot) var/obj/item/card/id/card = id_slot var/datum/job/J = H.job diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index e7813417d1e5c..9c630cf2b93e4 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -82,29 +82,29 @@ /obj/effect/landmark/corpsespawner/proc/equip_items_to_mob(mob/living/carbon/human/corpse) if(corpseuniform) - corpse.equip_to_slot_or_del(new corpseuniform(corpse), SLOT_W_UNIFORM) + corpse.equip_to_slot_or_del(new corpseuniform(corpse), ITEM_SLOT_ICLOTHING) if(corpsesuit) - corpse.equip_to_slot_or_del(new corpsesuit(corpse), SLOT_WEAR_SUIT) + corpse.equip_to_slot_or_del(new corpsesuit(corpse), ITEM_SLOT_OCLOTHING) if(corpseshoes) - corpse.equip_to_slot_or_del(new corpseshoes(corpse), SLOT_SHOES) + corpse.equip_to_slot_or_del(new corpseshoes(corpse), ITEM_SLOT_FEET) if(corpsegloves) - corpse.equip_to_slot_or_del(new corpsegloves(corpse), SLOT_GLOVES) + corpse.equip_to_slot_or_del(new corpsegloves(corpse), ITEM_SLOT_GLOVES) if(corpseradio) - corpse.equip_to_slot_or_del(new corpseradio(corpse), SLOT_EARS) + corpse.equip_to_slot_or_del(new corpseradio(corpse), ITEM_SLOT_EARS) if(corpseglasses) - corpse.equip_to_slot_or_del(new corpseglasses(corpse), SLOT_GLASSES) + corpse.equip_to_slot_or_del(new corpseglasses(corpse), ITEM_SLOT_EYES) if(corpsemask) - corpse.equip_to_slot_or_del(new corpsemask(corpse), SLOT_WEAR_MASK) + corpse.equip_to_slot_or_del(new corpsemask(corpse), ITEM_SLOT_MASK) if(corpsehelmet) - corpse.equip_to_slot_or_del(new corpsehelmet(corpse), SLOT_HEAD) + corpse.equip_to_slot_or_del(new corpsehelmet(corpse), ITEM_SLOT_HEAD) if(corpsebelt) - corpse.equip_to_slot_or_del(new corpsebelt(corpse), SLOT_BELT) + corpse.equip_to_slot_or_del(new corpsebelt(corpse), ITEM_SLOT_BELT) if(corpsepocket1) - corpse.equip_to_slot_or_del(new corpsepocket1(corpse), SLOT_R_STORE) + corpse.equip_to_slot_or_del(new corpsepocket1(corpse), ITEM_SLOT_R_POCKET) if(corpsepocket2) - corpse.equip_to_slot_or_del(new corpsepocket2(corpse), SLOT_L_STORE) + corpse.equip_to_slot_or_del(new corpsepocket2(corpse), ITEM_SLOT_L_POCKET) if(corpseback) - corpse.equip_to_slot_or_del(new corpseback(corpse), SLOT_BACK) + corpse.equip_to_slot_or_del(new corpseback(corpse), ITEM_SLOT_BACK) if(corpseid) var/obj/item/card/id/newid = new(corpse) newid.name = "[corpse.real_name]'s ID Card" @@ -124,7 +124,7 @@ if(corpseidjob) newid.assignment = corpseidjob newid.registered_name = corpse.real_name - corpse.equip_to_slot_or_del(newid, SLOT_WEAR_ID) + corpse.equip_to_slot_or_del(newid, ITEM_SLOT_ID) // I'll work on making a list of corpses people request for maps, or that I think will be commonly used. Syndicate operatives for example. diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index afbd631513419..4e5ee17f66a3e 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -426,10 +426,10 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan SHOULD_CALL_PARENT(TRUE) // no exceptions SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot) - var/equipped_to_slot = equip_slot_flags & slotdefine2slotbit(slot) + var/equipped_to_slot = equip_slot_flags & slot if(equipped_to_slot) // equip_slot_flags is a bitfield SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_TO_SLOT, user, slot) - else + else // ivan todo this looks like it wont work SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, user, slot) for(var/datum/action/A AS in actions) @@ -454,7 +454,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_UNEQUIPPED, unequipper, slot) - var/equipped_from_slot = equip_slot_flags & slotdefine2slotbit(slot) + var/equipped_from_slot = equip_slot_flags & slot for(var/datum/action/A AS in actions) A.remove_action(unequipper) @@ -503,12 +503,12 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan * * override_nodrop - do we take into consideration if the item is nodrop? * * into_storage - are we trying to put src into a storage item in the slot? */ -/obj/item/proc/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, into_storage) +/obj/item/proc/mob_can_equip(mob/user, slot = NONE, warning = TRUE, override_nodrop = FALSE, into_storage) if(!slot || !user) return FALSE - if(HAS_TRAIT(src, TRAIT_NODROP) && slot != SLOT_L_HAND && slot != SLOT_R_HAND && !override_nodrop) //No drops can only be equipped to a hand slot - if(slot == SLOT_L_HAND || slot == SLOT_R_HAND) + if(HAS_TRAIT(src, TRAIT_NODROP) && !(slot & ITEM_SLOT_HANDS) && !override_nodrop) //No drops can only be equipped to a hand slot + if(slot & ITEM_SLOT_HANDS) to_chat(user, span_notice("[src] is stuck to your hand!")) return FALSE @@ -518,7 +518,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan var/mob/living/carbon/human/human_user = user if(!human_user.has_limb_for_slot(slot)) return - var/list/mob_equip = list() //todo this looks stinky + var/list/mob_equip = list() // ivan todo this looks stinky if(human_user.species.hud?.equip_slots) mob_equip = human_user.species.hud.equip_slots @@ -556,6 +556,33 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) return TRUE return FALSE + if(ITEM_SLOT_OCLOTHING) + if(isclothing(human_user.wear_suit)) + for(var/key AS in human_user.wear_suit.attachments_by_slot) + var/atom/attachment = human_user.wear_suit.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) + return TRUE + return FALSE + if(ITEM_SLOT_HEAD) + if(isclothing(human_user.head)) + for(var/key AS in human_user.head.attachments_by_slot) + var/atom/attachment = human_user.head.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) + return TRUE + return FALSE + if(ITEM_SLOT_FEET) + if(isclothing(human_user.shoes)) + for(var/key AS in human_user.shoes.attachments_by_slot) + var/atom/attachment = human_user.shoes.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) + return TRUE + return FALSE if(ITEM_SLOT_BACK) if(!human_user.back?.storage_datum?.can_be_inserted(src, human_user, FALSE)) return FALSE @@ -586,27 +613,27 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return TRUE /// The storage item in the specific slot we're trying to insert into - var/obj/item/selected_storage + //var/obj/item/selected_storage //ivan todo switch(slot) - if(SLOT_L_HAND) + if(ITEM_SLOT_L_HAND) if(human_user.l_hand) return FALSE return TRUE - if(SLOT_R_HAND) + if(ITEM_SLOT_R_HAND) if(human_user.r_hand) return FALSE return TRUE - if(SLOT_HANDCUFFED) + if(ITEM_SLOT_HANDCUFF) if(human_user.handcuffed) return FALSE if(!istype(src, /obj/item/restraints/handcuffs)) return FALSE return TRUE - if(SLOT_S_STORE) //suit storage uniquely depends on the suit allowed list, so is a bit snowflake + if(ITEM_SLOT_SUITSTORE) //suit storage uniquely depends on the suit allowed list, so is a bit snowflake if(human_user.s_store) return FALSE - if(!human_user.wear_suit && (SLOT_WEAR_SUIT in mob_equip)) + if(!human_user.wear_suit && (ITEM_SLOT_OCLOTHING in mob_equip)) if(warning) to_chat(human_user, span_warning("You need a suit before you can attach this [name].")) return FALSE @@ -614,10 +641,11 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return TRUE return FALSE - // from here on we're properly equipping into the actual slots (respecting equip slot flags) - if(!(equip_slot_flags & slot)) - return FALSE - + // from here on we're properly equipping into the actual slots (respecting equip slot flags) + if(!(equip_slot_flags & slot)) + return FALSE + + switch(slot) //actual slots if(ITEM_SLOT_MASK) if(human_user.wear_mask) @@ -651,21 +679,21 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(ITEM_SLOT_OCLOTHING) if(human_user.wear_suit) return FALSE - if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) if(warning) to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(ITEM_SLOT_BELT) if(human_user.belt) return FALSE - if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) if(warning) to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(ITEM_SLOT_L_POCKET) if(human_user.l_pocket) return FALSE - if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) if(warning) to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE @@ -674,12 +702,13 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(ITEM_SLOT_R_POCKET) if(human_user.r_pocket) return FALSE - if(!human_user.w_uniform && (SLOT_W_UNIFORM in mob_equip)) + if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) if(warning) to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(w_class <= 2) return TRUE + return TRUE /*// ivan todo this sucks!!!!!!! //holsters - need to check for specific item types if(SLOT_IN_B_HOLSTER) diff --git a/code/game/objects/items/blink_drive.dm b/code/game/objects/items/blink_drive.dm index cf08618148642..56854aaa6f234 100644 --- a/code/game/objects/items/blink_drive.dm +++ b/code/game/objects/items/blink_drive.dm @@ -55,7 +55,7 @@ /obj/item/blink_drive/equipped(mob/user, slot) . = ..() equipped_user = user - if(slot == SLOT_BACK) + if(slot & ITEM_SLOT_BACK) blink_action.give_action(user) /obj/item/blink_drive/dropped(mob/user) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index d26c1243409d9..d5b96df33a904 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -127,7 +127,7 @@ if (ishuman(C)) var/mob/living/carbon/human/H = C - if (!H.has_limb_for_slot(SLOT_HANDCUFFED)) + if (!H.has_limb_for_slot(ITEM_SLOT_HANDCUFF)) to_chat(user, span_warning("\The [H] needs at least two wrists before you can cuff them together!")) return diff --git a/code/game/objects/items/jetpack.dm b/code/game/objects/items/jetpack.dm index ee4c4b7628176..927897911fa03 100644 --- a/code/game/objects/items/jetpack.dm +++ b/code/game/objects/items/jetpack.dm @@ -45,7 +45,7 @@ /obj/item/jetpack_marine/equipped(mob/user, slot) . = ..() - if(slot == SLOT_BACK) + if(slot & ITEM_SLOT_BACK) toggle_action.give_action(user) /obj/item/jetpack_marine/dropped(mob/user) diff --git a/code/game/objects/items/marine_gear.dm b/code/game/objects/items/marine_gear.dm index 450b90f45af67..6fff935914c1a 100644 --- a/code/game/objects/items/marine_gear.dm +++ b/code/game/objects/items/marine_gear.dm @@ -296,7 +296,7 @@ ///Set up the link between belt and object /obj/item/belt_harness/proc/attach_item(obj/item/to_attach, mob/user) - reequip_component = to_attach.AddComponent(/datum/component/reequip, list(SLOT_S_STORE, SLOT_BACK)) + reequip_component = to_attach.AddComponent(/datum/component/reequip, list(ITEM_SLOT_SUITSTORE, ITEM_SLOT_BACK)) RegisterSignals(reequip_component, list(COMSIG_REEQUIP_FAILURE, COMSIG_QDELETING), PROC_REF(detach_item)) playsound(src,'sound/machines/click.ogg', 15, FALSE, 1) to_chat(user, span_notice("[src] clicks as you hook \the [to_attach] into it.")) @@ -328,7 +328,7 @@ /obj/item/belt_harness/marine/equipped(mob/user, slot) . = ..() - if(slot == SLOT_BELT) + if(slot & ITEM_SLOT_BELT) playsound(src,'sound/machines/click.ogg', 15, FALSE, 1) to_chat(user, span_danger("!!REMEMBER TO ATTACH YOUR WEAPON TO YOUR HARNESS OR IT WON'T WORK!!")) diff --git a/code/game/objects/items/megaphone.dm b/code/game/objects/items/megaphone.dm index 6f9304b6285de..5d5ac5a81e4bc 100644 --- a/code/game/objects/items/megaphone.dm +++ b/code/game/objects/items/megaphone.dm @@ -15,7 +15,7 @@ /obj/item/megaphone/equipped(mob/M, slot) . = ..() - if ((slot == SLOT_L_HAND) || (slot == SLOT_R_HAND)) + if(slot & ITEM_SLOT_HANDS) RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm index b00dc776cde4b..8d00acecae729 100644 --- a/code/game/objects/items/radio/headset.dm +++ b/code/game/objects/items/radio/headset.dm @@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( camera = new /obj/machinery/camera/headset(src) /obj/item/radio/headset/mainship/equipped(mob/living/carbon/human/user, slot) - if(slot == SLOT_EARS) + if(slot & ITEM_SLOT_EARS) if(faction && (faction != user.faction) && user.faction != FACTION_NEUTRAL) safety_protocol(user) return diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 80d60bbd65bb5..ed137031250f9 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -29,7 +29,7 @@ playsound(loc, storage_datum.use_sound, 15, 1, 6) /obj/item/storage/backpack/equipped(mob/user, slot) - if(slot == SLOT_BACK) + if(slot & ITEM_SLOT_BACK) mouse_opacity = 2 //so it's easier to click when properly equipped. if(storage_datum.use_sound) playsound(loc, storage_datum.use_sound, 15, 1, 6) @@ -378,7 +378,7 @@ /obj/item/storage/backpack/marine/duffelbag/equipped(mob/equipper, slot) . = ..() - if(slot == SLOT_BACK) + if(slot & ITEM_SLOT_BACK) RegisterSignal(equipper, COMSIG_CLICK_RIGHT, PROC_REF(on_rclick_duffel_wearer)) RegisterSignal(equipper, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_move)) for(var/mob/M AS in storage_datum.content_watchers) @@ -678,7 +678,7 @@ /obj/item/storage/backpack/marine/satchel/scout_cloak/item_action_slot_check(mob/user, slot) if(!ishuman(user)) return FALSE - if(slot != SLOT_BACK) + if(!(slot & ITEM_SLOT_BACK)) return FALSE return TRUE diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index f3a95a90059c9..78915c8cbe7ed 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -13,13 +13,13 @@ storage_type = /datum/storage/belt /obj/item/storage/belt/equipped(mob/user, slot) - if(slot == SLOT_BELT) + if(slot & ITEM_SLOT_BELT) mouse_opacity = 2 //so it's easier to click when properly equipped. - ..() + return ..() /obj/item/storage/belt/dropped(mob/user) mouse_opacity = initial(mouse_opacity) - ..() + return ..() /obj/item/storage/belt/vendor_equip(mob/user) ..() diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 6c8880d0b4e6c..2915f30f13550 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -158,7 +158,7 @@ var/obj/item/clothing/mask/cigarette/C = locate() in src if(C) storage_datum.remove_from_storage(C, get_turf(user), user) - user.equip_to_slot_if_possible(C, SLOT_WEAR_MASK) + user.equip_to_slot_if_possible(C, ITEM_SLOT_MASK) to_chat(user, span_notice("You take a cigarette out of the pack.")) update_icon() else @@ -254,7 +254,7 @@ var/obj/item/clothing/mask/cigarette/cigar/C = locate() in src if(C) storage_datum.remove_from_storage(C, get_turf(user), user) - user.equip_to_slot_if_possible(C, SLOT_WEAR_MASK) + user.equip_to_slot_if_possible(C, ITEM_SLOT_MASK) to_chat(user, span_notice("You take a cigar out of the case.")) update_icon() else diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 5582414c35e2a..842a70f31be19 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -32,7 +32,7 @@ storage_datum.holstered_item_underlay = src.holstered_item_underlay /obj/item/storage/holster/equipped(mob/user, slot) - if (slot == SLOT_BACK || slot == SLOT_BELT || slot == SLOT_S_STORE || slot == SLOT_L_STORE || slot == SLOT_R_STORE ) //add more if needed + if(slot & (ITEM_SLOT_BACK|ITEM_SLOT_BELT|ITEM_SLOT_SUITSTORE|ITEM_SLOT_R_POCKET|ITEM_SLOT_L_POCKET)) //add more if needed mouse_opacity = MOUSE_OPACITY_OPAQUE //so it's easier to click when properly equipped. return ..() @@ -112,7 +112,7 @@ playsound(loc, storage_datum.use_sound, 15, 1, 6) /obj/item/storage/holster/backholster/equipped(mob/user, slot) - if (slot == SLOT_BACK) + if(slot & ITEM_SLOT_BACK) mouse_opacity = MOUSE_OPACITY_OPAQUE //so it's easier to click when properly equipped. if(storage_datum.use_sound) playsound(loc, storage_datum.use_sound, 15, 1, 6) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 4d01da6da78fc..27f2205f63d62 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -24,13 +24,13 @@ . += "Can be worn by attaching it to a pocket." /obj/item/storage/pouch/equipped(mob/user, slot) - if(slot == SLOT_L_STORE || slot == SLOT_R_STORE) + if(slot & ITEM_SLOT_POCKET) mouse_opacity = 2 //so it's easier to click when properly equipped. - ..() + return ..() /obj/item/storage/pouch/dropped(mob/user) mouse_opacity = initial(mouse_opacity) - ..() + return ..() /obj/item/storage/pouch/vendor_equip(mob/user) ..() diff --git a/code/game/objects/machinery/OpTable.dm b/code/game/objects/machinery/OpTable.dm index 443dfa53def88..4db68bc32650b 100644 --- a/code/game/objects/machinery/OpTable.dm +++ b/code/game/objects/machinery/OpTable.dm @@ -98,7 +98,7 @@ if(buckling_human.wear_mask && !buckling_human.dropItemToGround(buckling_human.wear_mask)) to_chat(user, span_danger("You can't remove their mask!")) return FALSE - if(!buckling_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/medical(buckling_human), SLOT_WEAR_MASK)) + if(!buckling_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/medical(buckling_human), ITEM_SLOT_MASK)) to_chat(user, span_danger("You can't fit the gas mask over their face!")) return FALSE buckling_human.visible_message("[span_notice("[user] fits the mask over [buckling_human]'s face and turns on the anesthetic.")]'") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index c76a50c8e889f..45fcfbb71b105 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1963,7 +1963,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] if("createid") if(!istype(H) || H.wear_id) return - H.equip_to_slot_or_del(new /obj/item/card/id(H), SLOT_WEAR_ID) + H.equip_to_slot_or_del(new /obj/item/card/id(H), ITEM_SLOT_ID) if("squad") previous = H.assigned_squad change = input("Choose the marine's new squad.", "Change Squad") as null|anything in SSjob.squads diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 3aa83f85eb024..f355a4b45d022 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -8,238 +8,242 @@ GLOBAL_LIST_INIT(gear_datums, populate_gear_list()) .[G.display_name] = G /datum/gear - var/display_name //Name/index. - var/path //Path to item. - var/cost //Number of points used. - var/slot //Slot to equip to. + /// Name shown + var/display_name + /// Path to item. + var/path + /// Number of points used. + var/cost + /// Slot to equip to. + var/slot /datum/gear/flower display_name = "Flower Pin" path = /obj/item/clothing/head/hairflower cost = 1 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/bandanna_grey display_name = "surplus bandanna (grey)" path = /obj/item/clothing/head/bandanna/grey cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/bandanna_red display_name = "surplus bandanna (red)" path = /obj/item/clothing/head/bandanna/red cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/bandanna_brown display_name = "surplus bandanna (brown)" path = /obj/item/clothing/head/bandanna/brown cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/eye_patch display_name = "Eye Patch" path = /obj/item/clothing/glasses/eyepatch cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/beret display_name = "surplus beret (blue)" path = /obj/item/clothing/head/tgmcberet cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_tan display_name = "surplus beret (tan)" path = /obj/item/clothing/head/tgmcberet/tan cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_green display_name = "surplus beret (green)" path = /obj/item/clothing/head/tgmcberet/green cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_green display_name = "surplus beret (red)" path = /obj/item/clothing/head/tgmcberet/red2 cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_darkgreen display_name = "surplus beret (dark green)" path = /obj/item/clothing/head/tgmcberet/darkgreen cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_bloodred display_name = "surplus beret (blood red)" path = /obj/item/clothing/head/tgmcberet/bloodred cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_bloodred/blue display_name = "surplus beret (dark blue)" path = /obj/item/clothing/head/tgmcberet/blueberet cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/beret_snow display_name = "surplus beret (snow)" path = /obj/item/clothing/head/tgmcberet/snow cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/headband_green display_name = "surplus headband (green)" path = /obj/item/clothing/head/headband cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/headband_red display_name = "surplus headband (red)" path = /obj/item/clothing/head/headband/red cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/headpiece display_name = "surplus earpiece" path = /obj/item/clothing/head/headset cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/cap display_name = "surplus cap" path = /obj/item/clothing/head/tgmccap cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/booniehat display_name = "surplus boonie hat" path = /obj/item/clothing/head/boonie cost = 3 - slot = SLOT_HEAD + slot = ITEM_SLOT_HEAD /datum/gear/eyepatch display_name = "Eyepatch" path = /obj/item/clothing/glasses/eyepatch cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/glasses display_name = "Prescription Glasses" path = /obj/item/clothing/glasses/regular cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/shades display_name = "Big shades" path = /obj/item/clothing/glasses/sunglasses/fake/big cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/shades_prescription display_name = "Big shades (prescription)" path = /obj/item/clothing/glasses/sunglasses/fake/big/prescription cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/sunglasses display_name = "Sunglasses" path = /obj/item/clothing/glasses/sunglasses/fake cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/sunglasses_prescription display_name = "Sunglasses (prescription)" path = /obj/item/clothing/glasses/sunglasses/fake/prescription cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/cigar display_name = "Cigar" path = /obj/item/clothing/mask/cigarette/cigar cost = 2 - slot = SLOT_WEAR_MASK + slot = ITEM_SLOT_MASK /datum/gear/cigarette display_name = "Cigarette" path = /obj/item/clothing/mask/cigarette cost = 2 - slot = SLOT_WEAR_MASK + slot = ITEM_SLOT_MASK /datum/gear/cigarette/pipe display_name = "Smoking pipe" path = /obj/item/clothing/mask/cigarette/pipe cost = 3 - slot = SLOT_WEAR_MASK + slot = ITEM_SLOT_MASK /datum/gear/cigarette/pipe/corn display_name = "Corn cob pipe" path = /obj/item/clothing/mask/cigarette/pipe/cobpipe cost = 3 - slot = SLOT_WEAR_MASK + slot = ITEM_SLOT_MASK /datum/gear/cigarette/pipe/corn/curved display_name = "Curved corn cob pipe" path = /obj/item/clothing/mask/cigarette/pipe/cobpipe/curved cost = 3 - slot = SLOT_WEAR_MASK + slot = ITEM_SLOT_MASK /datum/gear/cigarette/pipe/bone display_name = "Europan bone pipe" path = /obj/item/clothing/mask/cigarette/pipe/bonepipe cost = 3 - slot = SLOT_WEAR_MASK + slot = ITEM_SLOT_MASK /datum/gear/bgoggles display_name = "Ballistic goggles" path = /obj/item/clothing/glasses/mgoggles cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/bgoggles_prescription display_name = "Ballistic goggles (prescription)" path = /obj/item/clothing/glasses/mgoggles/prescription cost = 2 - slot = SLOT_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/kotahi display_name = "Kotahi deck" path = /obj/item/toy/deck/kotahi cost = 2 - slot = SLOT_R_HAND + slot = ITEM_SLOT_R_HAND /datum/gear/rosary display_name = "Rosary" path = /obj/item/rosary cost = 1 - slot = SLOT_R_HAND + slot = ITEM_SLOT_R_HAND /datum/gear/card/ace/hearts display_name = "Old Ace of Hearts card" path = /obj/item/toy/card/ace/hearts cost = 1 - slot = SLOT_R_HAND + slot = ITEM_SLOT_R_HAND /datum/gear/card/ace/spades display_name = "Old Ace of Spades card" path = /obj/item/toy/card/ace/spades cost = 1 - slot = SLOT_R_HAND + slot = ITEM_SLOT_R_HAND diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3055f1ce230bd..05e445fda272d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -35,7 +35,7 @@ /obj/item/clothing/equipped(mob/user, slot) . = ..() - if(!(equip_slot_flags & slotdefine2slotbit(slot))) + if(!(equip_slot_flags & slot)) return if(!ishuman(user)) return @@ -47,7 +47,7 @@ /obj/item/clothing/unequipped(mob/unequipper, slot) - if(!(equip_slot_flags & slotdefine2slotbit(slot))) + if(!(equip_slot_flags & slot)) return ..() if(!ishuman(unequipper)) return ..() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e22c988001d6d..4111f82c7c29b 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -391,17 +391,17 @@ /obj/item/clothing/glasses/sunglasses/sechud/equipped(mob/living/carbon/human/user, slot) - if(slot == SLOT_GLASSES) + if(slot & ITEM_SLOT_EYES) var/datum/atom_hud/H = GLOB.huds[hud_type] H.add_hud_to(user) - ..() + return ..() /obj/item/clothing/glasses/sunglasses/sechud/dropped(mob/living/carbon/human/user) if(istype(user)) if(src == user.glasses) //dropped is called before the inventory reference is updated. var/datum/atom_hud/H = GLOB.huds[hud_type] H.remove_hud_from(user) - ..() + return ..() /obj/item/clothing/glasses/sunglasses/sechud/tactical diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index cfba62b7bb375..41776acaaf3b5 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -17,7 +17,7 @@ /obj/item/clothing/glasses/hud/equipped(mob/user, slot) if(!ishuman(user)) return ..() - if(slot == SLOT_GLASSES) + if(slot & ITEM_SLOT_EYES) if(active) activate_hud(user) else if(affected_user) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index e5c5e0fcf3fba..70215fe2f6484 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -26,7 +26,7 @@ return if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_GAS_BREATH)) return - if(slot != SLOT_WEAR_MASK) + if(slot & ITEM_SLOT_MASK) return for(var/M in get_hearers_in_view(hearing_range, src)) if(ismob(M)) diff --git a/code/modules/clothing/modular_armor/attachments.dm b/code/modules/clothing/modular_armor/attachments.dm index 863171eeef5b1..3efbe551e933e 100644 --- a/code/modules/clothing/modular_armor/attachments.dm +++ b/code/modules/clothing/modular_armor/attachments.dm @@ -50,7 +50,7 @@ ///Layer for the attachment to be applied to. var/attachment_layer ///Slot that is required for the action to appear to the equipper. If null the action will appear whenever the item is equiped to a slot. - var/prefered_slot = SLOT_WEAR_SUIT + var/prefered_slot = ITEM_SLOT_OCLOTHING ///List of slots this attachment has. var/list/attachments_by_slot = list() @@ -107,7 +107,7 @@ ///Adds or removes actions based on whether the parent is in the correct slot. /obj/item/armor_module/proc/handle_actions(datum/source, mob/user, slot) SIGNAL_HANDLER - if(prefered_slot && (slot != prefered_slot) || !CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION)) + if(prefered_slot && !(slot & prefered_slot) || !CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION)) LAZYREMOVE(actions_types, /datum/action/item_action/toggle) var/datum/action/item_action/toggle/old_action = locate(/datum/action/item_action/toggle) in actions old_action?.remove_action(user) diff --git a/code/modules/clothing/modular_armor/attachments/cape.dm b/code/modules/clothing/modular_armor/attachments/cape.dm index 3873df4ad4ef0..42290ea77ebc2 100644 --- a/code/modules/clothing/modular_armor/attachments/cape.dm +++ b/code/modules/clothing/modular_armor/attachments/cape.dm @@ -7,7 +7,7 @@ icon_state = "cape" slot = ATTACHMENT_SLOT_CAPE attachment_layer = CAPE_LAYER - prefered_slot = SLOT_W_UNIFORM + prefered_slot = ITEM_SLOT_ICLOTHING greyscale_config = /datum/greyscale_config/cape attach_features_flags = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_ACTIVATION|ATTACH_NO_HANDS attach_delay = 0 SECONDS diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index fa0b6cb794102..fc9f19e9a6d9f 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -363,11 +363,11 @@ if(!recharge_timer) return examine_list += span_warning("Charging is delayed! It will start recharging again in [timeleft(recharge_timer) / 10] seconds!") - +// ivan todo all the stuff in here needs testing ///Handles starting the shield when the parent is equiped to the correct slot. /obj/item/armor_module/module/eshield/proc/handle_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - if(slot != SLOT_WEAR_SUIT || !isliving(equipper)) + if(!(slot & ITEM_SLOT_OCLOTHING) || !isliving(equipper)) return if(!recharge_timer) START_PROCESSING(SSobj, src) @@ -378,7 +378,7 @@ ///Handles removing the shield when the parent is unequipped /obj/item/armor_module/module/eshield/proc/handle_unequip(datum/source, mob/unequipper, slot) SIGNAL_HANDLER - if(slot != SLOT_WEAR_SUIT || !isliving(unequipper)) + if(slot != ITEM_SLOT_OCLOTHING || !isliving(unequipper)) return UnregisterSignal(unequipper, COMSIG_LIVING_SHIELDCALL) STOP_PROCESSING(SSobj, src) @@ -518,7 +518,7 @@ slot = ATTACHMENT_SLOT_HEAD_MODULE attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB active = FALSE - prefered_slot = SLOT_HEAD + prefered_slot = ITEM_SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "welding_head_xn") ///Mod for extra eye protection when activated. @@ -571,7 +571,7 @@ slot = ATTACHMENT_SLOT_HEAD_MODULE attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB active = FALSE - prefered_slot = SLOT_HEAD + prefered_slot = ITEM_SLOT_HEAD variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "welding_head_superior_xn") /obj/item/armor_module/module/welding/superior/on_attach(obj/item/attaching_to, mob/user) @@ -590,7 +590,7 @@ zoom_viewsize = 12 attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB slot = ATTACHMENT_SLOT_HEAD_MODULE - prefered_slot = SLOT_HEAD + prefered_slot = ITEM_SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE /obj/item/armor_module/module/binoculars/activate(mob/living/user) @@ -636,7 +636,7 @@ worn_icon_state = "artemis_head_a" slot = ATTACHMENT_SLOT_HEAD_MODULE attach_features_flags = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB - prefered_slot = SLOT_HEAD + prefered_slot = ITEM_SLOT_HEAD /obj/item/armor_module/module/artemis/on_attach(obj/item/attaching_to, mob/user) . = ..() @@ -654,7 +654,7 @@ worn_icon_state = "antenna_head_a" attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB slot = ATTACHMENT_SLOT_HEAD_MODULE - prefered_slot = SLOT_HEAD + prefered_slot = ITEM_SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE ///If the comms system is configured. var/comms_setup = FALSE @@ -662,7 +662,7 @@ var/startup_timer_id /obj/item/armor_module/module/antenna/handle_actions(datum/source, mob/user, slot) - if(slot != prefered_slot) + if(!(slot & prefered_slot)) UnregisterSignal(user, COMSIG_CAVE_INTERFERENCE_CHECK) comms_setup = COMMS_OFF if(startup_timer_id) @@ -715,7 +715,7 @@ icon_state = "night_vision" attach_features_flags = ATTACH_REMOVABLE|ATTACH_NO_HANDS slot = ATTACHMENT_SLOT_HEAD_MODULE - prefered_slot = SLOT_HEAD + prefered_slot = ITEM_SLOT_HEAD slowdown = 0.1 ///The goggles this module deploys var/obj/item/clothing/glasses/night_vision/mounted/attached_goggles @@ -775,7 +775,7 @@ ///Called when the parent is equipped; deploys the goggles /obj/item/armor_module/module/night_vision/proc/deploy(datum/source, mob/user, slot) SIGNAL_HANDLER - if(!ishuman(user) || prefered_slot != slot) //Must be human for the following procs to work + if(!ishuman(user) || !(prefered_slot & slot)) //Must be human for the following procs to work return var/mob/living/carbon/human/wearer = user diff --git a/code/modules/clothing/modular_armor/modular.dm b/code/modules/clothing/modular_armor/modular.dm index dd91f7c91b21f..2a6fed73aeac9 100644 --- a/code/modules/clothing/modular_armor/modular.dm +++ b/code/modules/clothing/modular_armor/modular.dm @@ -140,7 +140,7 @@ return standing /obj/item/clothing/suit/modular/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) - if(slot == SLOT_WEAR_SUIT && ishuman(user)) + if(slot == ITEM_SLOT_OCLOTHING && ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/clothing/under/undersuit = H.w_uniform if(!istype(undersuit, allowed_uniform_type)) @@ -168,7 +168,7 @@ return FALSE if(!ishuman(user)) return FALSE - if(slot != SLOT_WEAR_SUIT) + if(slot != ITEM_SLOT_OCLOTHING) return FALSE return TRUE //only give action button when armor is worn. diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index fada1c702a347..14d3bdcb120b0 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -89,7 +89,7 @@ /obj/item/clothing/suit/storage/marine/item_action_slot_check(mob/user, slot) if(!ishuman(user)) return FALSE - if(slot != SLOT_WEAR_SUIT) + if(!(slot & ITEM_SLOT_OCLOTHING)) return FALSE return TRUE //only give action button when armor is worn. @@ -162,7 +162,7 @@ /obj/item/clothing/suit/storage/marine/specialist/Initialize(mapload, ...) . = ..() AddComponent(/datum/component/suit_autodoc) - AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) + AddComponent(/datum/component/stun_mitigation, slot_override = ITEM_SLOT_OCLOTHING, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) AddElement(/datum/element/limb_support, supporting_limbs) if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b18_in_use += src @@ -427,8 +427,10 @@ return TRUE /obj/item/clothing/suit/storage/faction/item_action_slot_check(mob/user, slot) - if(!ishuman(user)) return FALSE - if(slot != SLOT_WEAR_SUIT) return FALSE + if(!ishuman(user)) + return FALSE + if(!(slot & ITEM_SLOT_OCLOTHING)) + return FALSE return TRUE //only give action button when armor is worn. /obj/item/clothing/suit/storage/faction/UPP diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 4f9d39da2238a..e65b3893784bb 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -192,7 +192,7 @@ /obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/user, slot) - if(slot == SLOT_WEAR_SUIT) + if(slot & ITEM_SLOT_OCLOTHING) ENABLE_BITFIELD(user.restrained_flags, RESTRAINED_STRAIGHTJACKET) user.stop_pulling() //Can't pull if restrained. if(user.handcuffed) //Keep the cuffs on. diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 6b5b1859c019d..97807225c026d 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -60,7 +60,7 @@ update_inv_l_hand() W.pixel_x = initial(W.pixel_x) W.pixel_y = initial(W.pixel_y) - W.equipped(src,SLOT_L_HAND) + W.equipped(src, ITEM_SLOT_L_HAND) return TRUE return FALSE @@ -88,7 +88,7 @@ update_inv_r_hand() W.pixel_x = initial(W.pixel_x) W.pixel_y = initial(W.pixel_y) - W.equipped(src,SLOT_R_HAND) + W.equipped(src, ITEM_SLOT_R_HAND) return TRUE return FALSE @@ -310,12 +310,12 @@ /mob/proc/doUnEquip(obj/item/I) if(I == r_hand) r_hand = null - I.unequipped(src, SLOT_R_HAND) + I.unequipped(src, ITEM_SLOT_R_HAND) update_inv_r_hand() return ITEM_UNEQUIP_DROPPED else if (I == l_hand) l_hand = null - I.unequipped(src, SLOT_L_HAND) + I.unequipped(src, ITEM_SLOT_L_HAND) update_inv_l_hand() return ITEM_UNEQUIP_DROPPED return ITEM_UNEQUIP_FAIL diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 41613cc685099..f8e0ce0edef33 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -317,7 +317,7 @@ if(!G || !gear.Find(i)) continue if(!equip_to_slot_or_del(new G.path, G.slot)) //try to put in the slot it says its supposed to go, if you can't: put it in a bag - equip_to_slot_or_del(new G.path, SLOT_IN_BACKPACK) + equip_to_slot_or_del(new G.path, ITEM_SLOT_BACK, FALSE, TRUE) /mob/living/carbon/human/update_sight() if(!client) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 89f0005891b14..a5a7d2dd0106c 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -453,20 +453,20 @@ * unless you know exactly what it does */ var/list/gear = list( - "i_clothing" = list("loc" = ui_iclothing, "slot" = SLOT_W_UNIFORM, "state" = "uniform", "toggle" = TRUE), - "o_clothing" = list("loc" = ui_oclothing, "slot" = SLOT_WEAR_SUIT, "state" = "suit", "toggle" = TRUE), - "mask" = list("loc" = ui_mask, "slot" = SLOT_WEAR_MASK, "state" = "mask", "toggle" = TRUE), - "gloves" = list("loc" = ui_gloves, "slot" = SLOT_GLOVES, "state" = "gloves", "toggle" = TRUE), - "eyes" = list("loc" = ui_glasses, "slot" = SLOT_GLASSES, "state" = "glasses","toggle" = TRUE), - "wear_ear" = list("loc" = ui_wear_ear, "slot" = SLOT_EARS, "state" = "ears", "toggle" = TRUE), - "head" = list("loc" = ui_head, "slot" = SLOT_HEAD, "state" = "head", "toggle" = TRUE), - "shoes" = list("loc" = ui_shoes, "slot" = SLOT_SHOES, "state" = "shoes", "toggle" = TRUE), - "suit storage" = list("loc" = ui_sstore1, "slot" = SLOT_S_STORE, "state" = "suit_storage"), - "back" = list("loc" = ui_back, "slot" = SLOT_BACK, "state" = "back"), - "id" = list("loc" = ui_id, "slot" = SLOT_WEAR_ID, "state" = "id"), - "storage1" = list("loc" = ui_storage1, "slot" = SLOT_L_STORE, "state" = "pocket"), - "storage2" = list("loc" = ui_storage2, "slot" = SLOT_R_STORE, "state" = "pocket"), - "belt" = list("loc" = ui_belt, "slot" = SLOT_BELT, "state" = "belt") + "i_clothing" = list("loc" = ui_iclothing, "slot" = ITEM_SLOT_ICLOTHING, "state" = "uniform", "toggle" = TRUE), + "o_clothing" = list("loc" = ui_oclothing, "slot" = ITEM_SLOT_OCLOTHING, "state" = "suit", "toggle" = TRUE), + "mask" = list("loc" = ui_mask, "slot" = ITEM_SLOT_MASK, "state" = "mask", "toggle" = TRUE), + "gloves" = list("loc" = ui_gloves, "slot" = ITEM_SLOT_GLOVES, "state" = "gloves", "toggle" = TRUE), + "eyes" = list("loc" = ui_glasses, "slot" = ITEM_SLOT_EYES, "state" = "glasses","toggle" = TRUE), + "wear_ear" = list("loc" = ui_wear_ear, "slot" = ITEM_SLOT_EARS, "state" = "ears", "toggle" = TRUE), + "head" = list("loc" = ui_head, "slot" = ITEM_SLOT_HEAD, "state" = "head", "toggle" = TRUE), + "shoes" = list("loc" = ui_shoes, "slot" = ITEM_SLOT_FEET, "state" = "shoes", "toggle" = TRUE), + "suit storage" = list("loc" = ui_sstore1, "slot" = ITEM_SLOT_SUITSTORE, "state" = "suit_storage"), + "back" = list("loc" = ui_back, "slot" = ITEM_SLOT_BACK, "state" = "back"), + "id" = list("loc" = ui_id, "slot" = ITEM_SLOT_ID, "state" = "id"), + "storage1" = list("loc" = ui_storage1, "slot" = ITEM_SLOT_L_POCKET, "state" = "pocket"), + "storage2" = list("loc" = ui_storage2, "slot" = ITEM_SLOT_R_POCKET, "state" = "pocket"), + "belt" = list("loc" = ui_belt, "slot" = ITEM_SLOT_BELT, "state" = "belt") ) /datum/hud_data/New() @@ -475,28 +475,28 @@ equip_slots |= gear[slot]["slot"] if(has_hands) - equip_slots |= SLOT_L_HAND - equip_slots |= SLOT_R_HAND - equip_slots |= SLOT_HANDCUFFED - if(SLOT_HEAD in equip_slots) - equip_slots |= SLOT_IN_HEAD - if(SLOT_BACK in equip_slots) - equip_slots |= SLOT_IN_BACKPACK - equip_slots |= SLOT_IN_B_HOLSTER - if(SLOT_BELT in equip_slots) - equip_slots |= SLOT_IN_HOLSTER - equip_slots |= SLOT_IN_BELT - if(SLOT_WEAR_SUIT in equip_slots) - equip_slots |= SLOT_IN_S_HOLSTER - equip_slots |= SLOT_IN_SUIT - if(SLOT_SHOES in equip_slots) - equip_slots |= SLOT_IN_BOOT - if(SLOT_W_UNIFORM in equip_slots) - equip_slots |= SLOT_IN_STORAGE - equip_slots |= SLOT_IN_L_POUCH - equip_slots |= SLOT_IN_R_POUCH - equip_slots |= SLOT_ACCESSORY - equip_slots |= SLOT_IN_ACCESSORY + equip_slots |= ITEM_SLOT_L_HAND + equip_slots |= ITEM_SLOT_R_HAND + equip_slots |= ITEM_SLOT_HANDCUFF + if(ITEM_SLOT_HEAD in equip_slots) + equip_slots |= ITEM_SLOT_HEAD + if(ITEM_SLOT_BACK in equip_slots) + equip_slots |= ITEM_SLOT_BACK + //equip_slots |= SLOT_IN_B_HOLSTER //ivan todo + if(ITEM_SLOT_BELT in equip_slots) + //equip_slots |= SLOT_IN_HOLSTER + equip_slots |= ITEM_SLOT_BELT + if(ITEM_SLOT_SUITSTORE in equip_slots) + //equip_slots |= SLOT_IN_S_HOLSTER + equip_slots |= ITEM_SLOT_SUITSTORE + if(ITEM_SLOT_FEET in equip_slots) + equip_slots |= ITEM_SLOT_FEET + //if(SLOT_W_UNIFORM in equip_slots) + //equip_slots |= SLOT_IN_STORAGE + //equip_slots |= SLOT_IN_L_POUCH + //equip_slots |= SLOT_IN_R_POUCH + //equip_slots |= SLOT_ACCESSORY + //equip_slots |= SLOT_IN_ACCESSORY ///damage override at the species level, called by /mob/living/proc/apply_damage /datum/species/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, sharp = FALSE, edge = FALSE, updating_health = FALSE, penetration, mob/living/carbon/human/victim, mob/attacker) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 1b423ab699ce4..98a4adf7bad81 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -38,7 +38,7 @@ return TRUE if(istype(wear_mask, /obj/item/clothing/mask/facehugger) && human_user != src) - human_user.stripPanelUnequip(wear_mask, src, SLOT_WEAR_MASK) + human_user.stripPanelUnequip(wear_mask, src, ITEM_SLOT_MASK) return TRUE if(health >= get_crit_threshold()) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 42a1a0cd5520f..3723d4f267b99 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -67,7 +67,7 @@ //Equipment slots. These are all references to items. ///The item currently being worn in the suit slot (usually armor) - var/obj/item/wear_suit + var/obj/item/clothing/suit/wear_suit ///The item currently inside the suit storage slot (not inside the armor itself) var/obj/item/s_store ///The jumpsuit/uniform that's currently being worn. @@ -81,7 +81,7 @@ ///The glasses being worn. var/obj/item/clothing/glasses/glasses ///The item currently on the character's head. - var/obj/item/head + var/obj/item/clothing/head/head ///The headset/ear item being worn. var/obj/item/wear_ear ///The ID being worn. diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 35843c417c578..d52df40b0d2fa 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -116,7 +116,7 @@ wear_suit = null if(s_store) dropItemToGround(s_store) - I.unequipped(src, SLOT_WEAR_SUIT) + I.unequipped(src, ITEM_SLOT_OCLOTHING) if(I.inv_hide_flags & HIDESHOES) update_inv_shoes() if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) @@ -135,7 +135,7 @@ if(wear_suit && istype(wear_suit, /obj/item/clothing/suit)) dropItemToGround(wear_suit) w_uniform = null - I.unequipped(src, SLOT_W_UNIFORM) + I.unequipped(src, ITEM_SLOT_ICLOTHING) update_suit_sensors() update_inv_w_uniform() . = ITEM_UNEQUIP_UNEQUIPPED @@ -144,7 +144,7 @@ if(head.inv_hide_flags & HIDEFACE) updatename = 1 head = null - I.unequipped(src, SLOT_HEAD) + I.unequipped(src, ITEM_SLOT_HEAD) if(updatename) name = get_visible_name() if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR|HIDE_EXCESS_HAIR)) @@ -159,12 +159,12 @@ . = ITEM_UNEQUIP_UNEQUIPPED else if (I == gloves) gloves = null - I.unequipped(src, SLOT_GLOVES) + I.unequipped(src, ITEM_SLOT_GLOVES) update_inv_gloves() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == glasses) glasses = null - I.unequipped(src, SLOT_GLASSES) + I.unequipped(src, ITEM_SLOT_EYES) var/obj/item/clothing/glasses/G = I if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) update_sight() @@ -173,38 +173,38 @@ . = ITEM_UNEQUIP_UNEQUIPPED else if (I == wear_ear) wear_ear = null - I.unequipped(src, SLOT_EARS) + I.unequipped(src, ITEM_SLOT_EARS) update_inv_ears() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == shoes) shoes = null - I.unequipped(src, SLOT_SHOES) + I.unequipped(src, ITEM_SLOT_FEET) update_inv_shoes() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == belt) belt = null - I.unequipped(src, SLOT_BELT) + I.unequipped(src, ITEM_SLOT_BELT) update_inv_belt() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == wear_id) wear_id = null - I.unequipped(src, SLOT_WEAR_ID) + I.unequipped(src, ITEM_SLOT_ID) update_inv_wear_id() name = get_visible_name() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == r_pocket) r_pocket = null - I.unequipped(src, SLOT_R_STORE) + I.unequipped(src, ITEM_SLOT_R_POCKET) update_inv_pockets() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == l_pocket) l_pocket = null - I.unequipped(src, SLOT_L_STORE) + I.unequipped(src, ITEM_SLOT_L_POCKET) update_inv_pockets() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == s_store) s_store = null - I.unequipped(src, SLOT_S_STORE) + I.unequipped(src, ITEM_SLOT_SUITSTORE) update_inv_s_store() . = ITEM_UNEQUIP_UNEQUIPPED @@ -227,18 +227,12 @@ if(into_storage) var/obj/item/selected_storage_target switch(slot) - if(ITEM_SLOT_FEET) - selected_storage_target = shoes if(ITEM_SLOT_BACK) selected_storage_target = back if(ITEM_SLOT_SUITSTORE) selected_storage_target = s_store - if(ITEM_SLOT_OCLOTHING) - selected_storage_target = wear_suit if(ITEM_SLOT_BELT) selected_storage_target = belt - if(ITEM_SLOT_HEAD) - selected_storage_target = head if(ITEM_SLOT_ACTIVE_STORAGE) selected_storage_target = s_active if(ITEM_SLOT_L_POCKET) @@ -253,6 +247,30 @@ continue selected_storage_target = attachment break + if(ITEM_SLOT_OCLOTHING) + if(isclothing(wear_suit)) + for(var/key AS in wear_suit.attachments_by_slot) + var/atom/attachment = wear_suit.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + selected_storage_target = attachment + break + if(ITEM_SLOT_HEAD) + if(isclothing(head)) + for(var/key AS in head.attachments_by_slot) + var/atom/attachment = head.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + selected_storage_target = attachment + break + if(ITEM_SLOT_FEET) + if(isclothing(shoes)) + for(var/key AS in shoes.attachments_by_slot) + var/atom/attachment = shoes.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + selected_storage_target = attachment + break var/datum/storage/selected_storage = selected_storage_target.storage_datum if(!isdatumstorage(selected_storage)) //probably means can_equip failed its job @@ -454,8 +472,8 @@ * item_searched the item you want to check */ /mob/living/carbon/human/proc/is_item_in_slots(item_searched) - for (var/slot in SLOT_ALL) - if (get_item_by_slot(slot) == item_searched) + for(var/slot in SLOT_ALL) + if(get_item_by_slot(slot) == item_searched) return TRUE return FALSE @@ -464,8 +482,8 @@ * type searched the type you are looking for */ /mob/living/carbon/human/proc/get_type_in_slots(type_searched) - for (var/slot in SLOT_ALL) - if (istype(get_item_by_slot(slot),type_searched)) + for(var/slot in SLOT_ALL) + if(istype(get_item_by_slot(slot),type_searched)) return get_item_by_slot(slot) @@ -474,8 +492,8 @@ * item_searched the item you want to check */ /mob/living/carbon/human/proc/is_item_in_hands(obj/item/item_searched) - if (get_item_by_slot(SLOT_R_HAND) == item_searched) + if(get_item_by_slot(ITEM_SLOT_R_HAND) == item_searched) return TRUE - if (get_item_by_slot(SLOT_L_HAND) == item_searched) + if(get_item_by_slot(ITEM_SLOT_L_HAND) == item_searched) return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/combat_robots.dm b/code/modules/mob/living/carbon/human/species_types/combat_robots.dm index c7b9e9e8a396c..48a36e66f3599 100644 --- a/code/modules/mob/living/carbon/human/species_types/combat_robots.dm +++ b/code/modules/mob/living/carbon/human/species_types/combat_robots.dm @@ -27,13 +27,13 @@ species_flags = NO_BREATHE|NO_BLOOD|NO_POISON|NO_PAIN|NO_CHEM_METABOLIZATION|NO_STAMINA|DETACHABLE_HEAD|HAS_NO_HAIR|ROBOTIC_LIMBS|IS_INSULATED no_equip = list( - SLOT_W_UNIFORM, - SLOT_HEAD, - SLOT_WEAR_MASK, - SLOT_WEAR_SUIT, - SLOT_SHOES, - SLOT_GLOVES, - SLOT_GLASSES, + ITEM_SLOT_ICLOTHING, + ITEM_SLOT_HEAD, + ITEM_SLOT_MASK, + ITEM_SLOT_OCLOTHING, + ITEM_SLOT_FEET, + ITEM_SLOT_GLOVES, + ITEM_SLOT_EYES, ) blood_color = "#2d2055" //an oil-like color - a little note, robots cannot shed blood in any way, due to their flags hair_color = "#00000000" diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index c55d4bec91923..34897c9a6ee91 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -41,8 +41,8 @@ var/obj/item/card/id/id = H.wear_id id.access = list() // A bit gamey, but let's say ids have a security against zombies id.iff_signal = NONE - H.equip_to_slot_or_del(new claw_type, SLOT_R_HAND) - H.equip_to_slot_or_del(new claw_type, SLOT_L_HAND) + H.equip_to_slot_or_del(new claw_type, ITEM_SLOT_R_HAND) + H.equip_to_slot_or_del(new claw_type, ITEM_SLOT_L_HAND) var/datum/atom_hud/health_hud = GLOB.huds[DATA_HUD_MEDICAL_OBSERVER] health_hud.add_hud_to(H) H.job = new /datum/job/zombie //Prevent from skewing the respawn timer if you take a zombie, it's a ghost role after all @@ -69,9 +69,9 @@ if(limb.limb_status & LIMB_DESTROYED && !(limb.parent?.limb_status & LIMB_DESTROYED) && prob(10)) limb.remove_limb_flags(LIMB_DESTROYED) if(istype(limb, /datum/limb/hand/l_hand)) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_L_HAND) + H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, ITEM_SLOT_L_HAND) else if (istype(limb, /datum/limb/hand/r_hand)) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_R_HAND) + H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, ITEM_SLOT_R_HAND) H.update_body() else if(limb.limb_status & LIMB_BROKEN && prob(20)) limb.remove_limb_flags(LIMB_BROKEN | LIMB_SPLINTED | LIMB_STABILIZED) diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index b37a56b10d52a..6f92f3986a302 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -4,12 +4,12 @@ return if(I == back) back = null - I.unequipped(src, SLOT_BACK) + I.unequipped(src, ITEM_SLOT_BACK) update_inv_back() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == wear_mask) wear_mask = null - I.unequipped(src, SLOT_WEAR_MASK) + I.unequipped(src, ITEM_SLOT_MASK) wear_mask_update(I) . = ITEM_UNEQUIP_UNEQUIPPED else if(I == handcuffed) @@ -60,11 +60,11 @@ drop_all_held_items() stop_pulling() handcuffed = restraints - restraints.equipped(src, SLOT_HANDCUFFED) + restraints.equipped(src, ITEM_SLOT_HANDCUFF) handcuffed.RegisterSignal(src, COMSIG_LIVING_DO_RESIST, TYPE_PROC_REF(/atom/movable, resisted_against)) else if(handcuffed) handcuffed.UnregisterSignal(src, COMSIG_LIVING_DO_RESIST) - handcuffed.unequipped(src, SLOT_HANDCUFFED) + handcuffed.unequipped(src, ITEM_SLOT_HANDCUFF) update_inv_handcuffed() ///Updates the mask slot icon diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm index 6e9cf0c401ce9..ef0d1eb8b2701 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm @@ -291,9 +291,9 @@ var/mutable_appearance/stolen_appearance ///A list of slot to check for items, in order of priority var/static/list/slots_to_steal_from = list( - SLOT_S_STORE, - SLOT_BACK, - SLOT_SHOES, + ITEM_SLOT_SUITSTORE, + ITEM_SLOT_BACK, + ITEM_SLOT_FEET, ) /datum/action/ability/activable/xeno/snatch/action_activate() diff --git a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm index 9a7e0b51e167e..1fd1456c198fb 100644 --- a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm @@ -554,7 +554,7 @@ /obj/item/clothing/mask/facehugger/equipped(mob/living/user, slot) . = ..() - if(slot != SLOT_WEAR_MASK || stat == DEAD) + if(!(slot & ITEM_SLOT_MASK) || stat == DEAD) reset_attach_status(FALSE) return if(ishuman(user)) diff --git a/code/modules/mob/living/carbon/xenomorph/saddles.dm b/code/modules/mob/living/carbon/xenomorph/saddles.dm index f6435c1ea0f29..7b4a40fc14152 100644 --- a/code/modules/mob/living/carbon/xenomorph/saddles.dm +++ b/code/modules/mob/living/carbon/xenomorph/saddles.dm @@ -40,8 +40,8 @@ /obj/item/storage/backpack/marine/duffelbag/xenosaddle/mob_can_equip(mob/user, slot, warning, override_nodrop, bitslot) if(!slot || !user) return FALSE - if(HAS_TRAIT(src, TRAIT_NODROP) && slot != SLOT_L_HAND && slot != SLOT_R_HAND && !override_nodrop) //No drops can only be equipped to a hand slot - if(slot == SLOT_L_HAND || slot == SLOT_R_HAND) + if(HAS_TRAIT(src, TRAIT_NODROP) && !(slot & ITEM_SLOT_HANDS) && !override_nodrop) //No drops can only be equipped to a hand slot + if(slot & ITEM_SLOT_HANDS) to_chat(user, span_notice("[src] is stuck to your hand!")) return FALSE if(isxenorunner(user)) @@ -64,7 +64,7 @@ if(!do_after(user, 3 SECONDS, NONE, target)) return user.temporarilyRemoveItemFromInventory(src) - rouny.equip_to_slot_if_possible(src,SLOT_BACK,TRUE) + rouny.equip_to_slot_if_possible(src, ITEM_SLOT_BACK,TRUE) /obj/item/storage/backpack/marine/duffelbag/xenosaddle/equipped(mob/equipper, slot) . = ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 3ceee65712e8d..262583cb487e8 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -228,8 +228,10 @@ /mob/proc/equip_to_slot_if_possible(obj/item/item_to_equip, slot, ignore_delay = TRUE, del_on_fail = FALSE, warning = TRUE, override_nodrop = FALSE, into_storage) if(!istype(item_to_equip) || QDELETED(item_to_equip)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks return FALSE - if(isnull(into_storage) && !!get_item_by_slot(slot)) //if a specific into_storage value isn't provided we try to look for storage in the slot - into_storage = TRUE + if(isnull(into_storage)) //if a specific into_storage value isn't provided we try to look for storage in the slot + into_storage = FALSE + if(!!get_item_by_slot(slot)) + into_storage = TRUE if(!item_to_equip.mob_can_equip(src, slot, warning, override_nodrop, into_storage)) if(del_on_fail) qdel(item_to_equip) @@ -246,12 +248,12 @@ if(CHECK_BITFIELD(item_to_equip.item_flags, TWOHANDED)) item_to_equip.unwield(src) return TRUE - else - equip_to_slot(item_to_equip, slot, into_storage) //This proc should not ever fail. - //This will unwield items -without- triggering lights. - if(CHECK_BITFIELD(item_to_equip.item_flags, TWOHANDED)) - item_to_equip.unwield(src) - return TRUE + + equip_to_slot(item_to_equip, slot, into_storage) //This proc should not ever fail. + //This will unwield items -without- triggering lights. + if(CHECK_BITFIELD(item_to_equip.item_flags, TWOHANDED)) + item_to_equip.unwield(src) + return TRUE /** *This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on whether you can or can't eqip need to be done before! Use mob_can_equip() for that task. @@ -263,7 +265,7 @@ ///This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds starts and when events happen and such. /mob/proc/equip_to_slot_or_del(obj/item/W, slot, override_nodrop = FALSE, into_storage) - return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, FALSE, override_nodrop, into_storage) + return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, override_nodrop, into_storage) /// Tries to equip an item to the slot provided, otherwise tries to put it in hands, if hands are full the item is deleted /mob/proc/equip_to_slot_or_hand(obj/item/W, slot, override_nodrop = FALSE) diff --git a/code/modules/projectiles/gun_attachables/rail.dm b/code/modules/projectiles/gun_attachables/rail.dm index b935e1953f409..c089362227c32 100644 --- a/code/modules/projectiles/gun_attachables/rail.dm +++ b/code/modules/projectiles/gun_attachables/rail.dm @@ -110,7 +110,7 @@ . = ..() if(!master_gun) return - reequip_component = master_gun.AddComponent(/datum/component/reequip, list(SLOT_S_STORE, SLOT_BELT, SLOT_BACK)) + reequip_component = master_gun.AddComponent(/datum/component/reequip, list(ITEM_SLOT_SUITSTORE, ITEM_SLOT_BELT, ITEM_SLOT_BACK)) /obj/item/attachable/magnetic_harness/on_detach(attaching_item, mob/user) . = ..() diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index a7d78f320edc7..f84e7ce6280ce 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -514,7 +514,7 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w balloon_alert(usr, "Automatic unloading [CHECK_BITFIELD(reciever_flags, AMMO_RECIEVER_AUTO_EJECT) ? "enabled" : "disabled"].") /obj/item/weapon/gun/item_action_slot_check(mob/user, slot) - if(slot != SLOT_L_HAND && slot != SLOT_R_HAND && !CHECK_BITFIELD(item_flags, IS_DEPLOYED)) + if(!(slot & ITEM_SLOT_HANDS) && !CHECK_BITFIELD(item_flags, IS_DEPLOYED)) return FALSE return TRUE diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index c946cfcd4632f..579043dd4ae46 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -224,7 +224,7 @@ /obj/item/weapon/gun/energy/lasgun/pulse/Initialize(mapload, spawn_empty) . = ..() - AddComponent(/datum/component/reequip, list(SLOT_BELT)) //Innate mag harness, no more free pulse rifles for you >:( + AddComponent(/datum/component/reequip, list(ITEM_SLOT_BELT)) //Innate mag harness, no more free pulse rifles for you >:( //------------------------------------------------------- //A practice version of M43, only for memes diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 8674dfada0e4f..aa64562e665dd 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1453,7 +1453,7 @@ /obj/item/weapon/gun/rifle/sectoid_rifle/Initialize(mapload, spawn_empty) . = ..() - AddComponent(/datum/component/reequip, list(SLOT_BACK)) //Sectoids have alien powers that make them not lose their gun + AddComponent(/datum/component/reequip, list(ITEM_SLOT_BACK)) //Sectoids have alien powers that make them not lose their gun //only sectoids can fire it /obj/item/weapon/gun/rifle/sectoid_rifle/able_to_fire(mob/user) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b07dc407ca90c..da5778a840913 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1600,7 +1600,7 @@ . = ..() if(!iscarbon(user)) return - if(slot != SLOT_WEAR_MASK) + if(!(slot & ITEM_SLOT_MASK)) owner = null STOP_PROCESSING(SSobj, src) //equipped is triggered when moving from hands to mouth and vice versa return diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index 13d9bcc74573e..68dde3c3bb103 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -28,7 +28,7 @@ to_chat(entering_mob, span_warning("You can't enter the exosuit with other creatures attached to you!")) log_message("Permission denied (Attached mobs).", LOG_MECHA) return FALSE - var/obj/item/I = entering_mob.get_item_by_slot(SLOT_BACK) + var/obj/item/I = entering_mob.get_item_by_slot(ITEM_SLOT_BACK) if(I && istype(I, /obj/item/jetpack_marine)) to_chat(entering_mob, span_warning("Something on your back prevents you from entering the mech!")) return FALSE From 5e8ecb5dccbf13b5964e59f31eae2118dff7501a Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Wed, 2 Oct 2024 21:22:34 +0200 Subject: [PATCH 06/17] More things --- code/__DEFINES/equipment.dm | 159 +++++------------- code/modules/client/preferences_savefile.dm | 9 +- code/modules/client/preferences_ui.dm | 4 +- .../mob/living/carbon/human/inventory.dm | 2 +- code/modules/mob/mob.dm | 18 +- .../PlayerPreferences/DrawOrder.tsx | 2 +- 6 files changed, 50 insertions(+), 144 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index f2490a0c22228..639aea0586996 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -250,45 +250,6 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( "[ITEM_SLOT_R_HAND]" = "Right hand", )) -//================================================= - -//Inventory slots - These are mostly used to get items from certain slots -//Text strings so that the slots can be associated when doing inventory lists. -/* -#define SLOT_WEAR_ID 1 -#define SLOT_EARS 2 -#define SLOT_W_UNIFORM 3 -#define SLOT_SHOES 4 -#define SLOT_GLOVES 5 -#define SLOT_BELT 6 -#define SLOT_WEAR_SUIT 7 -#define SLOT_GLASSES 8 -#define SLOT_WEAR_MASK 9 -#define SLOT_HEAD 10 -#define SLOT_BACK 11 -#define SLOT_L_STORE 12 -#define SLOT_R_STORE 13 -#define SLOT_ACCESSORY 14//!!! this is webbing -#define SLOT_S_STORE 15 -#define SLOT_L_HAND 16 -#define SLOT_R_HAND 17 -#define SLOT_HANDCUFFED 18 - -#define SLOT_IN_BOOT 19//!! -#define SLOT_IN_BACKPACK 20//!! -#define SLOT_IN_SUIT 21//!! -#define SLOT_IN_ACCESSORY 23//!! -#define SLOT_IN_HOLSTER 24// !! belt holster -#define SLOT_IN_B_HOLSTER 25// !! back holster -#define SLOT_IN_S_HOLSTER 26// !! suit storage holster -#define SLOT_IN_STORAGE 27// !! currently open storage -#define SLOT_IN_L_POUCH 28// !! -#define SLOT_IN_R_POUCH 29// !! -#define SLOT_IN_HEAD 30// !! -#define SLOT_IN_BELT 31// !! -*/ -//================================================= - //Inventory slot strings. These are used for icons. (and checking if an item can be equipped in loadouts for some reason??) #define slot_back_str "slot_back" @@ -420,12 +381,14 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( ///Each slot you can draw from, used and messed with in your preferences. #define SLOT_DRAW_ORDER list(\ ITEM_SLOT_SUITSTORE,\ - ITEM_SLOT_BELT,\ ITEM_SLOT_OCLOTHING,\ - ITEM_SLOT_ACTIVE_STORAGE,\ + ITEM_SLOT_ICLOTHING,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_BACK,\ ITEM_SLOT_L_POCKET,\ ITEM_SLOT_R_POCKET,\ - ITEM_SLOT_BACK,\ + ITEM_SLOT_FEET,\ + ITEM_SLOT_ACTIVE_STORAGE,\ ) #define SLOT_ALL list(\ @@ -458,111 +421,65 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( ITEM_SLOT_L_POCKET,\ ITEM_SLOT_R_POCKET,\ ITEM_SLOT_FEET,\ + ITEM_SLOT_ACTIVE_STORAGE,\ ) #define SLOT_FLUFF_DRAW list(\ + "Uniform",\ + "Suit",\ "Suit Storage",\ - "Suit Inside",\ - "Belt",\ - "Back",\ + "Head",\ "Boot",\ - "Helmet",\ - "Left Pocket",\ + "Back",\ + "Belt",\ "Right Pocket",\ - "Webbing",\ - "Belt Inside",\ - "Belt Holster",\ - "Suit Storage Holster",\ - "Back Holster",\ + "Left Pocket",\ + "Active storage",\ ) /proc/slot_fluff_to_flag(slot) switch(slot) + if("Uniform") + return ITEM_SLOT_ICLOTHING + if("Suit") + return ITEM_SLOT_OCLOTHING if("Suit Storage") return ITEM_SLOT_SUITSTORE - if("Suit Inside") - return ITEM_SLOT_OCLOTHING - if("Belt") - return ITEM_SLOT_BELT - if("Back") - return ITEM_SLOT_BACK + if("Head") + return ITEM_SLOT_HEAD if("Boot") return ITEM_SLOT_FEET - /* - if("Backpack") - return SLOT_IN_BACKPACK - if("Helmet") - return SLOT_IN_HEAD - */ - if("Left Pocket") - return ITEM_SLOT_L_POCKET - /* // ivan todo - if("Left Pocket Inside") - return SLOT_IN_L_POUCH - */ + if("Back") + return ITEM_SLOT_BACK + if("Belt") + return ITEM_SLOT_BELT if("Right Pocket") return ITEM_SLOT_R_POCKET - /* - if("Right Pocket Inside") - return SLOT_IN_R_POUCH - if("Webbing") - return SLOT_IN_ACCESSORY - if("Belt Inside") - return SLOT_IN_BELT - if("Belt Holster") - return SLOT_IN_HOLSTER - if("Suit Storage Holster") - return SLOT_IN_S_HOLSTER - if("Back Holster") - return SLOT_IN_B_HOLSTER - */ + if("Left Pocket") + return ITEM_SLOT_L_POCKET if("Active Storage") return ITEM_SLOT_ACTIVE_STORAGE /proc/slot_flag_to_fluff(slot) switch(slot) + if(ITEM_SLOT_ICLOTHING) + return "Uniform" + if(ITEM_SLOT_OCLOTHING) + return "Suit" if(ITEM_SLOT_SUITSTORE) return "Suit Storage" - /* - if(SLOT_WEAR_SUIT) - return "Suit Inside" - */ - if(ITEM_SLOT_BELT) - return "Belt" - /* - if(SLOT_IN_BELT) - return "Belt Inside" - */ - if(ITEM_SLOT_BACK) - return "Back" + if(ITEM_SLOT_HEAD) + return "Head" if(ITEM_SLOT_FEET) return "Boot" - /* - if(SLOT_IN_BACKPACK) - return "Backpack" - if(SLOT_IN_HEAD) - return "Helmet" - */ + if(ITEM_SLOT_BACK) + return "Back" + if(ITEM_SLOT_BELT) + return "Belt" + if(ITEM_SLOT_R_POCKET) + return "Right Pocket" if(ITEM_SLOT_L_POCKET) return "Left Pocket" - /* - if(SLOT_IN_L_POUCH) - return "Left Pocket Inside" - */ - if(ITEM_SLOT_POCKET) - return "Right Pocket" - /* - if(SLOT_IN_R_POUCH) - return "Right Pocket Inside" - if(SLOT_IN_ACCESSORY) - return "Webbing" - if(SLOT_IN_HOLSTER) - return "Belt Holster" - if(SLOT_IN_S_HOLSTER) - return "Suit Storage Holster" - if(SLOT_IN_B_HOLSTER) - return "Back Holster" - if(SLOT_IN_STORAGE) + if(ITEM_SLOT_ACTIVE_STORAGE) return "Active Storage" - */ diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index ddd2692a9e237..7998756657381 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -4,7 +4,7 @@ // You do not need to raise this if you are adding new values that have sane defaults. // Only raise this value when changing the meaning/format/name/layout of an existing value // where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 46 +#define SAVEFILE_VERSION_MAX 47 /datum/preferences/proc/savefile_needs_update(savefile/S) var/savefile_version @@ -56,7 +56,12 @@ toggles_sound |= SOUND_WEATHER WRITE_FILE(S["toggles_sound"], toggles_sound) to_chat(parent, span_userdanger("Due to a fix, preferences for weather sound have been reverted to default settings; these are now ON. Go into Preferences and set sound toggles to OFF if you wish to not hear these sounds.")) - + if(current_version < 47) + quick_equip = VALID_EQUIP_SLOTS + slot_draw_order_pref = SLOT_DRAW_ORDER + WRITE_FILE(S["quick_equip"], quick_equip) + WRITE_FILE(S["slot_draw_order_pref"], slot_draw_order_pref) + to_chat(parent, span_userdanger("Due to a refactor of slots, slot preferences have been reverted to defaults.")) //handles converting savefiles to new formats //MAKE SURE YOU KEEP THIS UP TO DATE! diff --git a/code/modules/client/preferences_ui.dm b/code/modules/client/preferences_ui.dm index 8d6e4c1ed88b6..e86f9d97c2650 100644 --- a/code/modules/client/preferences_ui.dm +++ b/code/modules/client/preferences_ui.dm @@ -688,11 +688,11 @@ if("change_quick_equip") var/editing_slot = params["selection"] - var/slot = tgui_input_list(usr, "Which slot would you like to draw/equip from?", "Preferred Slot", SLOT_FLUFF_DRAW) + var/slot = tgui_input_list(ui.user, "Which slot would you like to draw/equip from?", "Preferred Slot", SLOT_FLUFF_DRAW) if(!slot) return quick_equip[editing_slot] = slot_fluff_to_flag(slot) - to_chat(src, span_notice("You will now equip/draw from the [slot] slot first.")) + to_chat(ui.user, span_notice("You will now equip/draw from the [slot] slot first.")) if("equip_slot_equip_position") var/returned_item_list_position = slot_draw_order_pref.Find(slot_fluff_to_flag(params["changing_item"])) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index d52df40b0d2fa..71495861b549e 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -5,7 +5,7 @@ return COMSIG_KB_ACTIVATED //The return value must be a flag compatible with the signals triggering this. /// runs equip, quick_equip_used is the # in INVOKE_ASYNC -/mob/living/carbon/human/proc/do_quick_equip(quick_equip_slot = 0) +/mob/living/carbon/human/proc/do_quick_equip(quick_equip_slot = NONE) if(incapacitated() || lying_angle) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 262583cb487e8..5bc676ed58689 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -292,23 +292,7 @@ if(!I) return FALSE -/* - //This is quite horrible, there's probably a better way to do it. - //Each actual inventory slot has more than one slot define associated with it. - //The defines below are for specific items in specific slots, which allows for a much more specific draw order, i.e. drawing a weapon from a slot which would otherwise be lower in the order - if(slot == SLOT_IN_HOLSTER && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon)))) - return FALSE - if(slot == SLOT_IN_S_HOLSTER && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/belt/knifepouch)))) - return FALSE - if(slot == SLOT_IN_B_HOLSTER && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon)))) - return FALSE - if(slot == SLOT_IN_ACCESSORY && (!istype(I, /obj/item/clothing/under))) - return FALSE - if(slot == SLOT_IN_L_POUCH && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/pouch/pistol)))) - return FALSE - if(slot == SLOT_IN_R_POUCH && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/pouch/pistol)))) - return FALSE -*/ + //Sends quick equip signal, if our signal is not handled/blocked we continue to the normal behaviour var/return_value = SEND_SIGNAL(I, COMSIG_ITEM_QUICK_EQUIP, src) switch(return_value) diff --git a/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx b/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx index 2262952658236..83cd73401c587 100644 --- a/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx +++ b/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx @@ -16,7 +16,7 @@ export const DrawOrder = (props) => {
-
+
{draw_order.map((item) => ( From dc6e9b6ca36dca4422a0bca88782b54088b0cdb6 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sat, 5 Oct 2024 00:52:55 +0200 Subject: [PATCH 07/17] Fixed renamed big red area + final touchups --- code/__DEFINES/equipment.dm | 20 +-------- code/game/area/bigred.dm | 2 +- code/game/objects/items.dm | 44 +------------------ .../modular_armor/attachments/modules.dm | 2 +- .../mob/living/carbon/human/_species.dm | 9 ---- .../mob/living/carbon/human/inventory.dm | 10 +++-- code/modules/mob/mob.dm | 8 ++-- 7 files changed, 15 insertions(+), 80 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 639aea0586996..7bce6a453652d 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -271,7 +271,6 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define slot_r_store_str "slot_r_store" ///Correspondance between slot strings and slot numbers -//ivan todo make sure webbings work with loadouts GLOBAL_LIST_INIT(slot_str_to_slot, list( "slot_back" = ITEM_SLOT_BACK, "slot_l_hand" = ITEM_SLOT_L_HAND, @@ -360,23 +359,6 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( #define WEIGHT_CLASS_BULKY 4 //Items that can be weilded or equipped but not stored in an inventory, ex: Defibrillator, Backpack, Space Suits #define WEIGHT_CLASS_HUGE 5 //Usually represents objects that require two hands to operate, ex: Shotgun, Two Handed Melee Weapons #define WEIGHT_CLASS_GIGANTIC 6 //Essentially means it cannot be picked up or placed in an inventory, ex: Mech Parts, Safe -// ivan todo uhh look at the blame -#define SLOT_EQUIP_ORDER list(\ - ITEM_SLOT_ID,\ - ITEM_SLOT_EYES,\ - ITEM_SLOT_ICLOTHING,\ - ITEM_SLOT_OCLOTHING,\ - ITEM_SLOT_MASK,\ - ITEM_SLOT_HEAD,\ - ITEM_SLOT_FEET,\ - ITEM_SLOT_GLOVES,\ - ITEM_SLOT_EARS,\ - ITEM_SLOT_BELT,\ - ITEM_SLOT_BACK,\ - ITEM_SLOT_SUITSTORE,\ - ITEM_SLOT_L_POCKET,\ - ITEM_SLOT_R_POCKET,\ - ) ///Each slot you can draw from, used and messed with in your preferences. #define SLOT_DRAW_ORDER list(\ @@ -389,6 +371,7 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( ITEM_SLOT_R_POCKET,\ ITEM_SLOT_FEET,\ ITEM_SLOT_ACTIVE_STORAGE,\ + ITEM_SLOT_HEAD,\ ) #define SLOT_ALL list(\ @@ -422,6 +405,7 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( ITEM_SLOT_R_POCKET,\ ITEM_SLOT_FEET,\ ITEM_SLOT_ACTIVE_STORAGE,\ + ITEM_SLOT_HEAD,\ ) #define SLOT_FLUFF_DRAW list(\ diff --git a/code/game/area/bigred.dm b/code/game/area/bigred.dm index 4b410d1ce851e..1b83db40664b9 100644 --- a/code/game/area/bigred.dm +++ b/code/game/area/bigred.dm @@ -144,7 +144,7 @@ outside = FALSE minimap_color = MINIMAP_AREA_REQ -/area/bigredv2/outside/general_pocket +/area/bigredv2/outside/general_store name = "General Store" icon_state = "blueold" ceiling = CEILING_METAL diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 4e5ee17f66a3e..bee4e0cf542ad 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -429,7 +429,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan var/equipped_to_slot = equip_slot_flags & slot if(equipped_to_slot) // equip_slot_flags is a bitfield SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_TO_SLOT, user, slot) - else // ivan todo this looks like it wont work + else SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, user, slot) for(var/datum/action/A AS in actions) @@ -709,49 +709,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(w_class <= 2) return TRUE return TRUE -/*// ivan todo this sucks!!!!!!! - //holsters - need to check for specific item types - if(SLOT_IN_B_HOLSTER) - if(!human_user.back || !istype(human_user.back, /obj/item/storage/holster)) - return FALSE - selected_storage = human_user.back - if(SLOT_IN_HOLSTER) - if(!human_user.belt || (!istype(human_user.belt, /obj/item/storage/holster))) - return FALSE - selected_storage = human_user.belt - if(SLOT_IN_S_HOLSTER) - if(!human_user.s_store || (!istype(human_user.s_store, /obj/item/storage/holster))) - return FALSE - selected_storage = human_user.s_store - - else - return FALSE //Unsupported slot - - if(!selected_storage) - return FALSE - var/datum/storage/current_storage_datum - - if(isdatumstorage(selected_storage)) - current_storage_datum = selected_storage - - else if(selected_storage.storage_datum) - current_storage_datum = selected_storage.storage_datum - - else if(isclothing(selected_storage)) - var/obj/item/clothing/selected_clothing = selected_storage - for(var/key AS in selected_clothing.attachments_by_slot) - var/atom/attachment = selected_clothing.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - current_storage_datum = attachment.storage_datum - break - - if(!current_storage_datum) - return FALSE - - return current_storage_datum.can_be_inserted(src, user, warning) -*/ /// Checks whether the item can be unequipped from owner by stripper. Generates a message on failure and returns TRUE/FALSE /obj/item/proc/canStrip(mob/stripper, mob/owner) if(HAS_TRAIT(src, TRAIT_NODROP)) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index fc9f19e9a6d9f..30cd6e35e24d7 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -363,7 +363,7 @@ if(!recharge_timer) return examine_list += span_warning("Charging is delayed! It will start recharging again in [timeleft(recharge_timer) / 10] seconds!") -// ivan todo all the stuff in here needs testing + ///Handles starting the shield when the parent is equiped to the correct slot. /obj/item/armor_module/module/eshield/proc/handle_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index a5a7d2dd0106c..b64877ae6b843 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -482,21 +482,12 @@ equip_slots |= ITEM_SLOT_HEAD if(ITEM_SLOT_BACK in equip_slots) equip_slots |= ITEM_SLOT_BACK - //equip_slots |= SLOT_IN_B_HOLSTER //ivan todo if(ITEM_SLOT_BELT in equip_slots) - //equip_slots |= SLOT_IN_HOLSTER equip_slots |= ITEM_SLOT_BELT if(ITEM_SLOT_SUITSTORE in equip_slots) - //equip_slots |= SLOT_IN_S_HOLSTER equip_slots |= ITEM_SLOT_SUITSTORE if(ITEM_SLOT_FEET in equip_slots) equip_slots |= ITEM_SLOT_FEET - //if(SLOT_W_UNIFORM in equip_slots) - //equip_slots |= SLOT_IN_STORAGE - //equip_slots |= SLOT_IN_L_POUCH - //equip_slots |= SLOT_IN_R_POUCH - //equip_slots |= SLOT_ACCESSORY - //equip_slots |= SLOT_IN_ACCESSORY ///damage override at the species level, called by /mob/living/proc/apply_damage /datum/species/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, sharp = FALSE, edge = FALSE, updating_health = FALSE, penetration, mob/living/carbon/human/victim, mob/attacker) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 71495861b549e..83d7ef7ddd65e 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -29,15 +29,17 @@ if(s_active?.on_attackby(s_active, I, src)) //stored in currently open storage return TRUE + if(equip_to_appropriate_slot(I, FALSE, FALSE)) //we try to put it in an appropriate slot first + return if(slot_requested) - if(equip_to_slot_if_possible(I, slot_requested, FALSE, FALSE, FALSE)) + if(equip_to_slot_if_possible(I, slot_requested, FALSE, FALSE, FALSE)) // then we try to put it in the requested slot return - if(!equip_to_appropriate_slot(I, FALSE)) + if(equip_to_appropriate_slot(I, FALSE, TRUE)) // then we just go through draw_order storage return if(hand) - update_inv_l_hand(FALSE) + update_inv_l_hand() else - update_inv_r_hand(FALSE) + update_inv_r_hand() /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 5bc676ed58689..de61dc2f25822 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -272,13 +272,13 @@ if(!equip_to_slot_if_possible(W, slot, TRUE, FALSE, FALSE, FALSE, override_nodrop)) put_in_any_hand_if_possible(W, TRUE, FALSE) -///Attempts to store an item in a valid location based on SLOT_EQUIP_ORDER -/mob/proc/equip_to_appropriate_slot(obj/item/W, ignore_delay = TRUE) +///Attempts to store an item in a valid location based on SLOT_DRAW_ORDER +/mob/proc/equip_to_appropriate_slot(obj/item/W, ignore_delay = TRUE, into_storage) if(!istype(W)) return FALSE - for(var/slot in SLOT_EQUIP_ORDER) - if(equip_to_slot_if_possible(W, slot, ignore_delay, FALSE, FALSE, FALSE)) + for(var/slot in client?.prefs?.slot_draw_order_pref || SLOT_DRAW_ORDER) + if(equip_to_slot_if_possible(W, slot, ignore_delay, FALSE, FALSE, FALSE, into_storage)) return TRUE return FALSE From a1f5b5cabb09208299b549631243fcedfbee2cc8 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sat, 5 Oct 2024 01:04:58 +0200 Subject: [PATCH 08/17] Whoopsie --- code/datums/elements/strippable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 0a5134b71f710..2b7ecec60ba96 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -237,7 +237,7 @@ return FALSE var/mob/mob_source = source - mob_source.equip_to_slot(equipping, item_slot, TRUE) + mob_source.equip_to_slot(equipping, item_slot, FALSE) /datum/strippable_item/mob_item_slot/get_obscuring(atom/source) if(iscarbon(source)) From 42a402624e4177a9ac4901414d96394e0f211e30 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sat, 5 Oct 2024 02:09:32 +0200 Subject: [PATCH 09/17] Some things the master merge broke --- code/datums/outfits/icc.dm | 4 ++-- code/modules/clothing/modular_armor/attachments/modules.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/outfits/icc.dm b/code/datums/outfits/icc.dm index 4da8416213b29..18d3eb02efcdd 100644 --- a/code/datums/outfits/icc.dm +++ b/code/datums/outfits/icc.dm @@ -269,8 +269,8 @@ gloves = /obj/item/clothing/gloves/marine/icc/guard head = /obj/item/clothing/head/helmet/marine/icc/guard back = /obj/item/storage/backpack/lightpack/icc/guard - l_store = /obj/item/storage/pouch/medical_injectors/icc/firstaid - r_store = /obj/item/storage/pouch/construction/icc/full + l_pocket = /obj/item/storage/pouch/medical_injectors/icc/firstaid + r_pocket = /obj/item/storage/pouch/construction/icc/full suit_contents = list( /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 2, diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 9f04b5293be06..1070fdfeafcf1 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -128,7 +128,7 @@ /obj/item/armor_module/module/tyr_extra_armor/on_attach(obj/item/attaching_to, mob/user) . = ..() - attaching_to.AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) + attaching_to.AddComponent(/datum/component/stun_mitigation, slot_override = ITEM_SLOT_OCLOTHING, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) /obj/item/armor_module/module/tyr_extra_armor/on_detach(obj/item/detaching_from, mob/user) detaching_from.remove_component(/datum/component/stun_mitigation) From 76fe3911b486bfa7f53adb567cc5707bcaf6c651 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Wed, 9 Oct 2024 19:58:03 +0200 Subject: [PATCH 10/17] Some things --- code/datums/outfits/clf.dm | 4 +++- code/datums/outfits/erp.dm | 2 ++ code/datums/outfits/retired.dm | 5 ++++- code/datums/outfits/shipside.dm | 4 +--- code/datums/outfits/special_forces.dm | 5 +---- code/datums/outfits/upp.dm | 3 --- code/datums/outfits/upp_commando.dm | 4 ---- code/datums/outfits/vsd.dm | 12 +++++++++--- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/code/datums/outfits/clf.dm b/code/datums/outfits/clf.dm index c6f2a18dde4a6..8a5381bec643b 100644 --- a/code/datums/outfits/clf.dm +++ b/code/datums/outfits/clf.dm @@ -212,6 +212,7 @@ head = /obj/item/clothing/head/helmet/marine r_pocket = /obj/item/storage/pouch/pistol l_pocket = /obj/item/storage/pouch/medical_injectors/firstaid + back = /obj/item/storage/backpack/lightpack backpack_contents = list( /obj/item/stack/sheet/metal/medium_stack = 1, @@ -255,11 +256,12 @@ /obj/item/explosive/grenade/smokebomb = 1, ) + backpack_contents = null + /datum/outfit/job/clf/specialist/clf_heavymachinegun suit_store = /obj/item/weapon/gun/icc_hmg belt = /obj/item/storage/belt/sparepouch - back = /obj/item/storage/backpack/lightpack belt_contents = list( /obj/item/ammo_magazine/icc_hmg = 3, diff --git a/code/datums/outfits/erp.dm b/code/datums/outfits/erp.dm index f9bd3a93e370d..798eb873cea99 100644 --- a/code/datums/outfits/erp.dm +++ b/code/datums/outfits/erp.dm @@ -84,6 +84,8 @@ /obj/item/toy/bikehorn = 1, ) + belt_contents = null + /datum/outfit/job/erp/piethrower name = "ERP Pie thrower" diff --git a/code/datums/outfits/retired.dm b/code/datums/outfits/retired.dm index a9c8d9a9e69c9..9740369f64154 100644 --- a/code/datums/outfits/retired.dm +++ b/code/datums/outfits/retired.dm @@ -54,10 +54,13 @@ shoes = null suit_contents = list( - /obj/item/storage/fancy/chemrettes = 2, + /obj/item/storage/fancy/chemrettes = 1, /obj/item/explosive/grenade/m15 = 1, ) + belt_contents = null + backpack_contents = null + /datum/outfit/job/retired/leader/post_equip(mob/living/carbon/human/H, visualsOnly) H.amputate_limb(BODY_ZONE_L_LEG) H.amputate_limb(BODY_ZONE_R_LEG) diff --git a/code/datums/outfits/shipside.dm b/code/datums/outfits/shipside.dm index 79c735d4f3be0..46c4c79ecdbc1 100644 --- a/code/datums/outfits/shipside.dm +++ b/code/datums/outfits/shipside.dm @@ -235,10 +235,8 @@ gloves = /obj/item/clothing/gloves/insulated head = /obj/item/clothing/head/tgmccap/req r_pocket = /obj/item/storage/pouch/general/large + l_pocket = /obj/item/supplytablet - r_pocket_contents = list( - /obj/item/supplytablet = 1, - ) /datum/outfit/job/medical/professor name = CHIEF_MEDICAL_OFFICER diff --git a/code/datums/outfits/special_forces.dm b/code/datums/outfits/special_forces.dm index 0935528cd88cc..a57eb51dab064 100644 --- a/code/datums/outfits/special_forces.dm +++ b/code/datums/outfits/special_forces.dm @@ -68,7 +68,7 @@ /obj/item/ammo_magazine/smg/m25/ap = 2, /obj/item/explosive/plastique = 1, /obj/item/tool/crowbar/red = 1, - /obj/item/explosive/grenade/smokebomb/cloak = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 3, /obj/item/reagent_containers/hypospray/autoinjector/combat = 2, /obj/item/stack/medical/splint = 1, /obj/item/explosive/grenade/m15 = 2, @@ -87,9 +87,6 @@ /obj/item/weapon/gun/pistol/g22 = 1, ) - r_pocket_contents = list( - /obj/item/explosive/grenade/smokebomb/cloak = 1, - ) /datum/outfit/job/special_forces/drone_operator name = "Special Response Force Drone Operator" diff --git a/code/datums/outfits/upp.dm b/code/datums/outfits/upp.dm index fcd000929dedf..35794b7baf1d9 100644 --- a/code/datums/outfits/upp.dm +++ b/code/datums/outfits/upp.dm @@ -96,9 +96,6 @@ /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, ) - r_pocket_contents = list( - /obj/item/storage/firstaid/adv = 1, - ) /datum/outfit/job/upp/medic/hvh name = "USL Surgeon (HvH)" diff --git a/code/datums/outfits/upp_commando.dm b/code/datums/outfits/upp_commando.dm index 70e779568efcd..caeaca2427295 100644 --- a/code/datums/outfits/upp_commando.dm +++ b/code/datums/outfits/upp_commando.dm @@ -93,10 +93,6 @@ /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, ) - r_pocket_contents = list( - /obj/item/storage/firstaid/adv = 1, - ) - /datum/outfit/job/upp/commando/leader name = "USL Elite Captain" diff --git a/code/datums/outfits/vsd.dm b/code/datums/outfits/vsd.dm index 36fa7a8cee3ad..804ed32f9e2a2 100644 --- a/code/datums/outfits/vsd.dm +++ b/code/datums/outfits/vsd.dm @@ -154,9 +154,6 @@ backpack_contents = list( /obj/item/ammo_magazine/rifle/vsd_mg = 2, /obj/item/attachable/buildasentry = 1, - ) - - webbing_contents = list( /obj/item/stack/sheet/metal/large_stack = 1, ) @@ -182,6 +179,8 @@ /obj/item/ammo_magazine/rifle/vsd_rifle = 2, ) + head_contents = null + //outfits /datum/outfit/job/vsd/medic @@ -435,6 +434,7 @@ /obj/item/explosive/grenade/upp = 3, ) + head_contents = null //juggernaut outfits /datum/outfit/job/vsd/juggernaut @@ -543,6 +543,8 @@ r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid l_pocket = /obj/item/storage/pouch/magazine back = /obj/item/storage/backpack/lightpack/vsd + wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor + head = /obj/item/clothing/head/helmet/marine/vsd backpack_contents = list( /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, @@ -589,6 +591,8 @@ /obj/item/ammo_magazine/rifle/vsd_rifle = 2, ) + head_contents = null + /datum/outfit/job/vsd/leader/two head = /obj/item/clothing/head/helmet/marine/vsd wear_suit = /obj/item/clothing/suit/storage/marine/vsd/harmor @@ -632,3 +636,5 @@ l_pocket_contents = list( /obj/item/ammo_magazine/rifle/vsd_mg = 2, ) + + head_contents = null From 3b14edd947d657c605fad3fee163375ed1019989 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Thu, 10 Oct 2024 01:12:25 +0200 Subject: [PATCH 11/17] Surv --- code/datums/outfits/survivor.dm | 128 ++++++++++++++++++++++++++++++-- 1 file changed, 121 insertions(+), 7 deletions(-) diff --git a/code/datums/outfits/survivor.dm b/code/datums/outfits/survivor.dm index 8fb38bf81cb4d..5350fd1aeb578 100644 --- a/code/datums/outfits/survivor.dm +++ b/code/datums/outfits/survivor.dm @@ -1,9 +1,3 @@ -//Assistant -/datum/job/survivor/assistant - title = "Assistant Survivor" - outfit = /datum/outfit/job/survivor/assistant - - /datum/outfit/job/survivor/assistant name = "Assistant Survivor" jobtype = /datum/job/survivor/assistant @@ -19,6 +13,10 @@ l_pocket = /obj/item/flashlight/combat r_hand = /obj/item/weapon/combat_knife + backpack_contents = list( + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, + ) + /datum/outfit/job/survivor/scientist name = "Scientist Survivor" jobtype = /datum/job/survivor/scientist @@ -40,6 +38,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) @@ -61,6 +60,7 @@ backpack_contents = list( /obj/item/flashlight = 1, /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) belt_contents = list( @@ -102,7 +102,7 @@ w_uniform = /obj/item/clothing/under/rank/security wear_suit = /obj/item/clothing/suit/armor/patrol head = /obj/item/clothing/head/securitycap - shoes = /obj/item/clothing/shoes/marine + shoes = /obj/item/clothing/shoes/marine/full back = /obj/item/storage/backpack/security belt = /obj/item/storage/belt/security gloves = /obj/item/clothing/gloves/black @@ -112,6 +112,9 @@ backpack_contents = list( /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine = 1, /obj/item/tool/crowbar = 1, + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) belt_contents = list( @@ -133,6 +136,7 @@ /obj/item/tool/crowbar = 1, /obj/item/flashlight = 1, /obj/item/weapon/combat_knife/upp = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) @@ -160,6 +164,7 @@ /obj/item/reagent_containers/food/snacks/pastries/birthdaycakeslice = 1, /obj/item/reagent_containers/food/snacks/donut/meat = 1, /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) @@ -175,10 +180,12 @@ suit_store = /obj/item/weapon/combat_knife l_pocket = /obj/item/flashlight r_pocket = /obj/item/tool/crowbar + l_hand = /obj/item/weapon/gun/shotgun/double backpack_contents = list( /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris = 2, /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus = 2, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) /datum/outfit/job/survivor/atmos @@ -200,6 +207,8 @@ backpack_contents = list( /obj/item/lightreplacer = 1, /obj/item/deployable_floodlight = 1, + /obj/item/explosive/grenade/chem_grenade/metalfoam = 2, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) belt_contents = list( @@ -228,11 +237,16 @@ back = /obj/item/storage/backpack/satchel/norm ears = /obj/item/radio/survivor + l_hand = /obj/item/weapon/gun/shotgun/double + r_hand = /obj/item/ammo_magazine/handful/buckshot + backpack_contents = list( + /obj/item/storage/fancy/candle_box = 1, /obj/item/tool/candle = 3, /obj/item/tool/lighter = 1, /obj/item/storage/bible = 1, /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/cup/glass/bottle/holywater = 1, ) /datum/outfit/job/survivor/miner @@ -253,6 +267,7 @@ /obj/item/tool/lighter = 1, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, /obj/item/explosive/grenade/incendiary/molotov = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) @@ -273,6 +288,7 @@ /obj/item/ammo_magazine/pistol/holdout = 3, /obj/item/tool/lighter/zippo = 1, /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) @@ -295,6 +311,104 @@ /obj/item/restraints/handcuffs = 1, /obj/item/stack/medical/heal_pack/gauze = 1, /obj/item/tool/crowbar = 1, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, + ) + +/datum/outfit/job/survivor/bartender + name = "Bartender Survivor" + jobtype = /datum/job/survivor/bartender + + w_uniform = /obj/item/clothing/under/rank/bartender + wear_suit = /obj/item/clothing/suit/armor/vest + back = /obj/item/storage/backpack/satchel + belt = /obj/item/ammo_magazine/shotgun/buckshot + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/collectable/tophat + ears = /obj/item/radio/survivor + glasses = /obj/item/clothing/glasses/sunglasses + l_store = /obj/item/flashlight + r_store = /obj/item/tool/crowbar + suit_store = /obj/item/weapon/gun/shotgun/double/sawn + + backpack_contents = list( + /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, + /obj/item/reagent_containers/food/drinks/bottle/vodka = 1, + /obj/item/reagent_containers/food/drinks/cans/beer = 2, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, + ) + + + + + +/datum/outfit/job/survivor/chemist + name = "Pharmacy Technician Survivor" + jobtype = /datum/job/survivor/chemist + + w_uniform = /obj/item/clothing/under/rank/chemist + wear_suit = /obj/item/clothing/suit/storage/labcoat/chemist + back = /obj/item/storage/backpack/satchel/chem + belt = /obj/item/storage/belt/hypospraybelt + gloves = /obj/item/clothing/gloves/latex + shoes = /obj/item/clothing/shoes/white + ears = /obj/item/radio/survivor + glasses = /obj/item/clothing/glasses/science + l_store = /obj/item/flashlight + r_store = /obj/item/tool/crowbar + suit_store = /obj/item/healthanalyzer + + backpack_contents = list( + /obj/item/reagent_containers/dropper = 1, + /obj/item/stack/medical/heal_pack/advanced/bruise_pack = 1, + /obj/item/stack/medical/heal_pack/advanced/burn_pack = 1, + /obj/item/stack/medical/splint = 2, + /obj/item/defibrillator = 1, + /obj/item/clothing/glasses/hud/health = 1, + ) + + belt_contents = list( + /obj/item/reagent_containers/glass/bottle/bicaridine = 1, + /obj/item/reagent_containers/glass/bottle/kelotane = 1, + /obj/item/reagent_containers/glass/bottle/tramadol = 1, + /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, + /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, + /obj/item/reagent_containers/glass/beaker/large = 2, + /obj/item/reagent_containers/hypospray/advanced/bicaridine = 1, + /obj/item/reagent_containers/hypospray/advanced/kelotane = 1, + /obj/item/reagent_containers/hypospray/advanced/tramadol = 1, + /obj/item/reagent_containers/hypospray/advanced/tricordrazine = 1, + /obj/item/reagent_containers/hypospray/advanced/dylovene = 1, + /obj/item/reagent_containers/hypospray/advanced/inaprovaline = 1, + /obj/item/reagent_containers/hypospray/advanced/hypervene = 1, + /obj/item/reagent_containers/hypospray/advanced/imialky = 1, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = 1, + /obj/item/reagent_containers/hypospray/advanced/big = 2, + /obj/item/storage/syringe_case/empty = 2, + ) + + +/datum/outfit/job/survivor/roboticist + name = "Roboticist Survivor" + jobtype = /datum/job/survivor/roboticist + + w_uniform = /obj/item/clothing/under/rank/roboticist + wear_suit = /obj/item/clothing/suit/storage/labcoat/science + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/black + back = /obj/item/storage/backpack/satchel/tox + ears = /obj/item/radio/survivor + glasses = /obj/item/clothing/glasses/welding/flipped + l_store = /obj/item/storage/pouch/electronics/full + r_store = /obj/item/flashlight/combat + + backpack_contents = list( + /obj/item/stack/sheet/metal/medium_stack = 1, + /obj/item/stack/sheet/plasteel/small_stack = 1, + /obj/item/attachable/buildasentry = 1, + /obj/item/cell/high = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, ) /datum/outfit/job/survivor/rambo From c67e8767b7caad7f7106d3d1334f0cf6e06a0a96 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Thu, 17 Oct 2024 11:52:08 +0200 Subject: [PATCH 12/17] Fix more outfits --- code/datums/outfits/freelancers.dm | 23 +++--- code/datums/outfits/icc.dm | 16 +++- code/datums/outfits/som_ert.dm | 77 ++++++++++++++----- code/datums/outfits/som_shipside.dm | 39 ++++------ code/datums/outfits/survivor.dm | 13 ++-- code/datums/outfits/vsd.dm | 18 ++--- code/game/objects/items.dm | 5 +- code/modules/clothing/modular_armor/som.dm | 12 +++ code/modules/clothing/under/marine_uniform.dm | 6 ++ 9 files changed, 132 insertions(+), 77 deletions(-) diff --git a/code/datums/outfits/freelancers.dm b/code/datums/outfits/freelancers.dm index b294680f12fe5..0607289231571 100644 --- a/code/datums/outfits/freelancers.dm +++ b/code/datums/outfits/freelancers.dm @@ -127,15 +127,22 @@ /obj/item/ammo_magazine/rifle/famas = 3, ) + suit_contents = null /datum/outfit/job/freelancer/grenadier name = "Freelancer Veteran" jobtype = /datum/job/freelancer/grenadier + r_pocket = /obj/item/storage/pouch/grenade + + r_pocket_contents = list( + /obj/item/explosive/grenade = 2, + /obj/item/explosive/grenade/smokebomb/cloak = 2, + /obj/item/explosive/grenade/incendiary = 2, + ) /datum/outfit/job/freelancer/grenadier/one w_uniform = /obj/item/clothing/under/marine/veteran/freelancer/veteran suit_store = /obj/item/weapon/gun/rifle/alf_machinecarbine/freelancer - r_pocket = /obj/item/storage/pouch/grenade backpack_contents = list( /obj/item/ammo_magazine/rifle/alf_machinecarbine = 2, @@ -149,12 +156,6 @@ /obj/item/ammo_magazine/rifle/alf_machinecarbine = 6, ) - r_pocket_contents = list( - /obj/item/explosive/grenade = 2, - /obj/item/explosive/grenade/smokebomb/cloak = 2, - /obj/item/explosive/grenade/incendiary = 2, - ) - ///machine gunner /datum/outfit/job/freelancer/grenadier/two @@ -171,12 +172,6 @@ /obj/item/ammo_magazine/m412l1_hpr = 3, ) - r_pocket_contents = list( - /obj/item/explosive/grenade = 2, - /obj/item/explosive/grenade/smokebomb/cloak = 2, - /obj/item/explosive/grenade/incendiary = 2, - ) - ///actual grenadier /datum/outfit/job/freelancer/grenadier/three @@ -214,6 +209,8 @@ /obj/item/stack/sheet/metal/large_stack = 1, ) + suit_contents = null //leaders have a snowflake storage module which populates its own contents + /datum/outfit/job/freelancer/leader/one belt = /obj/item/storage/belt/grenade/b17 wear_suit = /obj/item/clothing/suit/storage/faction/freelancer/leader diff --git a/code/datums/outfits/icc.dm b/code/datums/outfits/icc.dm index 18d3eb02efcdd..73f3fd6100f41 100644 --- a/code/datums/outfits/icc.dm +++ b/code/datums/outfits/icc.dm @@ -31,7 +31,10 @@ /obj/item/tool/crowbar/red = 1, /obj/item/tool/screwdriver = 1, /obj/item/tool/wrench = 1, - /obj/item/storage/box/m94 = 1, + ) + + head_contents = list( + /obj/item/explosive/plastique = 2, ) suit_contents = list( @@ -39,7 +42,8 @@ ) webbing_contents = list( - /obj/item/explosive/plastique = 5, + /obj/item/explosive/plastique = 4, + /obj/item/storage/box/m94 = 1, ) r_pocket_contents = list( @@ -82,6 +86,7 @@ wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard gloves = /obj/item/clothing/gloves/marine/icc/guard head = /obj/item/clothing/head/helmet/marine/icc/guard + back = /obj/item/storage/backpack/lightpack/icc backpack_contents = list( /obj/item/tool/crowbar/red = 1, @@ -120,6 +125,8 @@ /obj/item/ammo_magazine/rocket/icc = 4, ) + backpack_contents = null + /datum/outfit/job/icc/guard/icc_autoshotgun suit_store = /obj/item/weapon/gun/rifle/icc_coilgun @@ -139,6 +146,7 @@ /obj/item/ammo_magazine/rifle/icc_autoshotgun = 3, ) + backpack_contents = null /datum/outfit/job/icc/guard/icc_bagmg wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard/heavy @@ -157,6 +165,8 @@ /obj/item/ammo_magazine/rifle/icc_coilgun = 3, ) + backpack_contents = null + /datum/outfit/job/icc/medic name = "ICC Medic" jobtype = /datum/job/icc/medic @@ -172,6 +182,7 @@ /obj/item/explosive/grenade/som = 6, /obj/item/defibrillator = 1, /obj/item/storage/box/m94 = 1, + /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, ) suit_contents = list( @@ -184,7 +195,6 @@ /obj/item/storage/pill_bottle/spaceacillin = 1, /obj/item/reagent_containers/hypospray/advanced/nanoblood = 1, /obj/item/bodybag/cryobag = 1, - /obj/item/reagent_containers/hypospray/advanced/combat_advanced = 1, ) diff --git a/code/datums/outfits/som_ert.dm b/code/datums/outfits/som_ert.dm index 6321ce9a2a323..613e89d07c3ce 100644 --- a/code/datums/outfits/som_ert.dm +++ b/code/datums/outfits/som_ert.dm @@ -9,7 +9,7 @@ ears = /obj/item/radio/headset/distress/som w_uniform = /obj/item/clothing/under/som/webbing shoes = /obj/item/clothing/shoes/marine/som/knife - wear_suit = /obj/item/clothing/suit/modular/som + wear_suit = /obj/item/clothing/suit/modular/som/medstorage gloves = /obj/item/clothing/gloves/marine/som mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/modular/som @@ -44,10 +44,6 @@ /obj/item/storage/box/m94 = 1, ) - belt_contents = list( - /obj/item/ammo_magazine/rifle/som = 6, - ) - webbing_contents = list( /obj/item/ammo_magazine/handful/micro_grenade = 2, /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath = 1, @@ -69,10 +65,6 @@ /obj/item/storage/box/m94 = 1, ) - belt_contents = list( - /obj/item/ammo_magazine/smg/som = 6, - ) - webbing_contents = list( /obj/item/explosive/grenade/som = 2, /obj/item/explosive/grenade/incendiary/som = 2, @@ -225,14 +217,6 @@ l_pocket = /obj/item/storage/pouch/grenade/som/ert back = /obj/item/storage/backpack/lightpack/som - suit_contents = list( - /obj/item/stack/medical/heal_pack/gauze = 1, - /obj/item/stack/medical/heal_pack/ointment = 1, - /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, - /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, - ) - head_contents = list( /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 1, @@ -265,6 +249,14 @@ suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet l_hand = /obj/item/weapon/shield/riot/marine/som + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + backpack_contents = list( /obj/item/tool/extinguisher = 1, /obj/item/tool/weldingtool/largetank = 1, @@ -346,6 +338,14 @@ back = /obj/item/storage/holster/backholster/rpg/som/ert l_pocket = /obj/item/storage/pouch/grenade/som + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + belt_contents = list( /obj/item/ammo_magazine/smg/som = 2, /obj/item/ammo_magazine/smg/som/rad = 4, @@ -367,7 +367,7 @@ /datum/outfit/job/som/ert/veteran/pyro head = /obj/item/clothing/head/modular/som/hades - wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro + wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro/genstorage belt = /obj/item/storage/holster/belt/pistol/m4a3/som back = /obj/item/ammo_magazine/flamer_tank/backtank suit_store = /obj/item/weapon/gun/flamer/som/mag_harness @@ -403,6 +403,14 @@ /obj/item/binoculars = 1, ) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + //Base SOM leader outfit /datum/outfit/job/som/ert/leader name = "SOM Leader" @@ -533,6 +541,14 @@ /obj/item/explosive/grenade/rad = 2, /obj/item/explosive/grenade/incendiary/som = 1, ) + + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) /datum/outfit/job/som/ert/veteran/breacher_rpg @@ -564,6 +580,14 @@ /obj/item/ammo_magazine/rocket/som/rad = 1, ) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + /datum/outfit/job/som/ert/veteran/breacher_flamer head = /obj/item/clothing/head/modular/som/hades wear_suit = /obj/item/clothing/suit/modular/som/heavy/pyro @@ -583,6 +607,14 @@ /obj/item/tool/extinguisher/mini = 1, ) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + /datum/outfit/job/som/ert/veteran/breacher_culverin head = /obj/item/clothing/head/modular/som/lorica wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica @@ -597,9 +629,18 @@ /obj/item/weapon/energy/sword/som = 1, ) + suit_contents = list( + /obj/item/stack/medical/heal_pack/gauze = 1, + /obj/item/stack/medical/heal_pack/ointment = 1, + /obj/item/reagent_containers/hypospray/autoinjector/isotonic = 1, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + ) + /datum/outfit/job/som/ert/medic/breacher head = /obj/item/clothing/head/modular/som/lorica + w_uniform = /obj/item/clothing/under/som/medic/vest/black wear_suit = /obj/item/clothing/suit/modular/som/heavy/lorica suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet l_hand = /obj/item/weapon/shield/riot/marine/som diff --git a/code/datums/outfits/som_shipside.dm b/code/datums/outfits/som_shipside.dm index af739a55a3b77..60e569dd6913f 100644 --- a/code/datums/outfits/som_shipside.dm +++ b/code/datums/outfits/som_shipside.dm @@ -4,9 +4,8 @@ id = /obj/item/card/id/gold - r_pocket_contents = list( - /obj/item/binoculars/fire_support/campaign/som = 1, - ) + r_hand = /obj/item/binoculars/fire_support/campaign/som + /datum/outfit/job/som/command/fieldcommander name = SOM_FIELD_COMMANDER @@ -104,49 +103,42 @@ head = /obj/item/clothing/head/tgmccap/req r_pocket = /obj/item/storage/pouch/general/large +/datum/outfit/job/som/medical + belt = /obj/item/storage/belt/rig/medical + shoes = /obj/item/clothing/shoes/white + gloves = /obj/item/clothing/gloves/latex + glasses = /obj/item/clothing/glasses/hud/health + mask = /obj/item/clothing/mask/surgical + back = /obj/item/storage/backpack/satchel + + backpack_contents = list( + /obj/item/tweezers_advanced = 1, + /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, + ) + /datum/outfit/job/som/medical/professor name = SOM_CHIEF_MEDICAL_OFFICER jobtype = /datum/job/som/medical/professor id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical ears = /obj/item/radio/headset/mainship/mcom w_uniform = /obj/item/clothing/under/rank/medical/blue wear_suit = /obj/item/clothing/suit/storage/labcoat/cmo - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/cmo r_pocket = /obj/item/storage/pouch/medkit/doctor l_pocket = /obj/item/storage/pouch/surgery - backpack_contents = list( - /obj/item/tweezers_advanced = 1, - /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, - ) - /datum/outfit/job/som/medical/medicalofficer name = SOM_MEDICAL_DOCTOR jobtype = /datum/job/som/medical/medicalofficer id = /obj/item/card/id - belt = /obj/item/storage/belt/rig/medical ears = /obj/item/radio/headset/mainship/doc w_uniform = /obj/item/clothing/under/rank/medical/purple wear_suit = /obj/item/clothing/suit/storage/labcoat - shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/latex - glasses = /obj/item/clothing/glasses/hud/health - mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/surgery/purple - backpack_contents = list( - /obj/item/tweezers_advanced = 1, - /obj/item/reagent_containers/glass/bottle/lemoline/doctor = 1, - ) - /datum/outfit/job/som/civilian/chef name = SOM_CHEF jobtype = /datum/job/som/civilian/chef @@ -161,6 +153,7 @@ glasses = /obj/item/clothing/glasses/hud/health mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/surgery/purple + back = /obj/item/storage/backpack/satchel backpack_contents = list( /obj/item/tweezers_advanced = 1, diff --git a/code/datums/outfits/survivor.dm b/code/datums/outfits/survivor.dm index 5350fd1aeb578..8958bfdbb5e46 100644 --- a/code/datums/outfits/survivor.dm +++ b/code/datums/outfits/survivor.dm @@ -161,7 +161,6 @@ /obj/item/reagent_containers/food/snacks/chocolateegg = 1, /obj/item/reagent_containers/food/snacks/meat/xeno = 1, /obj/item/reagent_containers/food/snacks/pastries/xemeatpie = 1, - /obj/item/reagent_containers/food/snacks/pastries/birthdaycakeslice = 1, /obj/item/reagent_containers/food/snacks/donut/meat = 1, /obj/item/tool/crowbar = 1, /obj/item/reagent_containers/food/drinks/cans/waterbottle = 1, @@ -326,8 +325,8 @@ head = /obj/item/clothing/head/collectable/tophat ears = /obj/item/radio/survivor glasses = /obj/item/clothing/glasses/sunglasses - l_store = /obj/item/flashlight - r_store = /obj/item/tool/crowbar + l_pocket = /obj/item/flashlight + r_pocket = /obj/item/tool/crowbar suit_store = /obj/item/weapon/gun/shotgun/double/sawn backpack_contents = list( @@ -353,8 +352,8 @@ shoes = /obj/item/clothing/shoes/white ears = /obj/item/radio/survivor glasses = /obj/item/clothing/glasses/science - l_store = /obj/item/flashlight - r_store = /obj/item/tool/crowbar + l_pocket = /obj/item/flashlight + r_pocket = /obj/item/tool/crowbar suit_store = /obj/item/healthanalyzer backpack_contents = list( @@ -399,8 +398,8 @@ back = /obj/item/storage/backpack/satchel/tox ears = /obj/item/radio/survivor glasses = /obj/item/clothing/glasses/welding/flipped - l_store = /obj/item/storage/pouch/electronics/full - r_store = /obj/item/flashlight/combat + l_pocket = /obj/item/storage/pouch/electronics/full + r_pocket = /obj/item/flashlight/combat backpack_contents = list( /obj/item/stack/sheet/metal/medium_stack = 1, diff --git a/code/datums/outfits/vsd.dm b/code/datums/outfits/vsd.dm index 804ed32f9e2a2..14712b3baff0b 100644 --- a/code/datums/outfits/vsd.dm +++ b/code/datums/outfits/vsd.dm @@ -95,6 +95,8 @@ /obj/item/ammo_magazine/rifle/vsd_rifle = 2, ) + head_contents = null + /datum/outfit/job/vsd/standard/grunt_third suit_store = /obj/item/weapon/gun/rifle/vsd_rifle/standard backpack_contents = list( @@ -171,10 +173,6 @@ /obj/item/ammo_magazine/rifle/vsd_rifle = 2, ) - webbing_contents = list( - /obj/item/ammo_magazine/rifle/vsd_rifle = 1, - ) - l_pocket_contents = list( /obj/item/ammo_magazine/rifle/vsd_rifle = 2, ) @@ -286,6 +284,8 @@ ears = /obj/item/radio/headset/distress/vsd glasses = /obj/item/clothing/glasses/night/vsd w_uniform = /obj/item/clothing/under/vsd/webbing + wear_suit = /obj/item/clothing/suit/storage/marine/vsd + head = /obj/item/clothing/head/helmet/marine/vsd shoes = /obj/item/clothing/shoes/marine/vsd gloves = /obj/item/clothing/gloves/marine/veteran/pmc r_pocket = /obj/item/storage/pouch/medical_injectors/firstaid @@ -377,12 +377,12 @@ ) /datum/outfit/job/vsd/spec/uslspec_one - w_uniform = /obj/item/clothing/under/vsd/upp + w_uniform = /obj/item/clothing/under/vsd/upp/white_webbing wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/upp head = /obj/item/clothing/head/helmet/marine/vsd/upp mask = /obj/item/clothing/mask/gas/vsd suit_store = /obj/item/weapon/gun/rifle/type71/flamer - l_pocket = /obj/item/storage/pouch/magazine + l_pocket = /obj/item/storage/pouch/general/large backpack_contents = list( /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = 1, @@ -392,7 +392,7 @@ /obj/item/storage/box/m94 = 1, /obj/item/tool/crowbar/red = 1, /obj/item/explosive/grenade/vsd = 1, - /obj/item/explosive/plastique = 2, + /obj/item/explosive/plastique = 1, ) belt_contents = list( @@ -406,11 +406,11 @@ ) l_pocket_contents = list( - /obj/item/ammo_magazine/flamer_tank/mini = 2, + /obj/item/ammo_magazine/flamer_tank/mini = 3, ) /datum/outfit/job/vsd/spec/uslspec_two - w_uniform = /obj/item/clothing/under/vsd/upp + w_uniform = /obj/item/clothing/under/vsd/upp/white_webbing wear_suit = /obj/item/clothing/suit/storage/marine/vsd/marmor/upp head = /obj/item/clothing/head/uppcap/beret glasses = /obj/item/clothing/glasses/sunglasses/fake diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index bee4e0cf542ad..19d4582c14418 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -525,7 +525,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(human_user.species && !(slot in mob_equip)) return FALSE - if(slot in human_user.species?.no_equip) + if((slot in human_user.species?.no_equip) && !into_storage) //the no_equip list only applies to actual slots, not storage insertion if(!is_type_in_list(human_user.species, species_exception)) return FALSE @@ -612,9 +612,6 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return FALSE return TRUE - /// The storage item in the specific slot we're trying to insert into - //var/obj/item/selected_storage //ivan todo - switch(slot) if(ITEM_SLOT_L_HAND) if(human_user.l_hand) diff --git a/code/modules/clothing/modular_armor/som.dm b/code/modules/clothing/modular_armor/som.dm index c0372e9a49519..5c5a520aae2a9 100644 --- a/code/modules/clothing/modular_armor/som.dm +++ b/code/modules/clothing/modular_armor/som.dm @@ -55,6 +55,12 @@ /obj/item/armor_module/storage/general/som, ) +/obj/item/clothing/suit/modular/som/medstorage + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/medical/som, + ) + /obj/item/clothing/suit/modular/som/shield starting_attachments = list( /obj/item/armor_module/module/eshield/som, @@ -138,6 +144,12 @@ /obj/item/armor_module/storage/medical/som, ) +/obj/item/clothing/suit/modular/som/heavy/pyro/genstorage + starting_attachments = list( + /obj/item/armor_module/module/fire_proof/som, + /obj/item/armor_module/storage/general/som, + ) + /obj/item/clothing/suit/modular/som/heavy/lorica starting_attachments = list( /obj/item/armor_module/module/tyr_extra_armor/som, diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index cd7488bbe4052..c80f7be52a01a 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -490,6 +490,9 @@ /obj/item/clothing/under/som/medic/vest starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) +/obj/item/clothing/under/som/medic/vest/black + starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + /obj/item/clothing/under/som/veteran name = "\improper SOM veteran uniform" desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies. This one has markings indicating specialist status." @@ -626,6 +629,9 @@ /obj/item/clothing/under/vsd/upp/webbing starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) +/obj/item/clothing/under/vsd/upp/white_webbing + starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) + /obj/item/clothing/under/vsd/shirt name = "V.S.D shirt" icon_state = "vsd_shirt" From c1710560ba7b1898afc07cce19286e0e11c5de1d Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Wed, 23 Oct 2024 11:45:14 +0200 Subject: [PATCH 13/17] Meh --- code/__DEFINES/equipment.dm | 5 +++-- code/datums/gamemodes/campaign/loadout_items/secondary.dm | 2 +- code/datums/outfits/mercenaries.dm | 6 +++--- code/datums/outfits/pmc.dm | 8 ++++---- code/game/objects/items.dm | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 2f45a7f1be722..42fba7d2ce85e 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -228,7 +228,7 @@ #define ITEM_SLOT_R_HAND (1<<16) //right hand #define ITEM_SLOT_HANDS (ITEM_SLOT_L_HAND|ITEM_SLOT_R_HAND) //a combo of the above #define ITEM_SLOT_ACTIVE_STORAGE (1<<17) // the currently open/active storage container -#define ITEM_SLOT_SECONDARY (1<<18) //campaign loadouts only //ivan todo i hate lumi +#define ITEM_SLOT_SECONDARY (1<<18) //campaign loadouts only ///Inventory slot bits to plain english strings GLOBAL_LIST_INIT(inventory_slots_to_string, list( @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( )) -//Inventory slot strings. These are used for icons. (and checking if an item can be equipped in loadouts for some reason??) +//Inventory slot strings. These are used for icons and the loadout vendor. #define slot_back_str "slot_back" #define slot_l_hand_str "slot_l_hand" #define slot_r_hand_str "slot_r_hand" @@ -376,6 +376,7 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( ITEM_SLOT_HEAD,\ ) +/// A list of all slots, generally used for looping through all slots. #define SLOT_ALL list(\ ITEM_SLOT_ID,\ ITEM_SLOT_EARS,\ diff --git a/code/datums/gamemodes/campaign/loadout_items/secondary.dm b/code/datums/gamemodes/campaign/loadout_items/secondary.dm index 8d0504af99b11..d908924a6c102 100644 --- a/code/datums/gamemodes/campaign/loadout_items/secondary.dm +++ b/code/datums/gamemodes/campaign/loadout_items/secondary.dm @@ -77,7 +77,7 @@ var/gun_spawned = FALSE var/ammo_spawned = FALSE - if(isholster(wearer.belt)) //ivan todo + if(isholster(wearer.belt)) var/obj/item/storage/holster/holster = wearer.belt wearer.equip_to_slot_or_del(new item_typepath(wearer), ITEM_SLOT_BELT) gun_spawned = TRUE diff --git a/code/datums/outfits/mercenaries.dm b/code/datums/outfits/mercenaries.dm index c3a1167dfb3ea..ce78204fb3e34 100644 --- a/code/datums/outfits/mercenaries.dm +++ b/code/datums/outfits/mercenaries.dm @@ -5,7 +5,7 @@ id = /obj/item/card/id/silver ears = /obj/item/radio/headset/distress/dutch w_uniform = /obj/item/clothing/under/marine/veteran/mercenary - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary gloves = /obj/item/clothing/gloves/combat head = /obj/item/clothing/head/helmet/marine/veteran/mercenary @@ -19,7 +19,7 @@ id = /obj/item/card/id/silver ears = /obj/item/radio/headset/distress/dutch w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/miner - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner gloves = /obj/item/clothing/gloves/combat head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner @@ -34,7 +34,7 @@ ears = /obj/item/radio/headset/distress/dutch w_uniform = /obj/item/clothing/under/marine/veteran/mercenary/engineer belt = /obj/item/storage/belt/utility/full - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/mercenary/engineer gloves = /obj/item/clothing/gloves/combat head = /obj/item/clothing/head/helmet/marine/veteran/mercenary/engineer diff --git a/code/datums/outfits/pmc.dm b/code/datums/outfits/pmc.dm index d513868e4c2e2..73505cb504358 100644 --- a/code/datums/outfits/pmc.dm +++ b/code/datums/outfits/pmc.dm @@ -6,7 +6,7 @@ belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/distress/pmc w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/veteran/pmc @@ -59,7 +59,7 @@ belt = /obj/item/belt_harness/marine ears = /obj/item/radio/headset/distress/pmc w_uniform = /obj/item/clothing/under/marine/veteran/pmc/holster - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/gunner gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner @@ -108,7 +108,7 @@ belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70_pmc ears = /obj/item/radio/headset/distress/pmc w_uniform = /obj/item/clothing/under/marine/veteran/pmc/webbing - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper @@ -150,7 +150,7 @@ belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/distress/pmc w_uniform = /obj/item/clothing/under/marine/veteran/pmc/leader/holster - shoes = /obj/item/clothing/shoes/veteran/pmc/full + shoes = /obj/item/clothing/shoes/marine/pmc/full wear_suit = /obj/item/clothing/suit/storage/marine/veteran/pmc/leader gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/helmet/marine/veteran/pmc/leader diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 19d4582c14418..47092b7fff3f6 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -518,7 +518,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan var/mob/living/carbon/human/human_user = user if(!human_user.has_limb_for_slot(slot)) return - var/list/mob_equip = list() // ivan todo this looks stinky + var/list/mob_equip = list() if(human_user.species.hud?.equip_slots) mob_equip = human_user.species.hud.equip_slots From 7ad1c24dc5731a62d078b8c9f6721e58e506622a Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sun, 29 Dec 2024 22:57:05 +0100 Subject: [PATCH 14/17] Remove changes from equip --- code/__DEFINES/equipment.dm | 391 +++++++++--- code/__DEFINES/is_helpers.dm | 2 +- code/__DEFINES/preferences.dm | 10 +- code/__HELPERS/pronouns.dm | 18 +- code/_onclick/hud/human.dm | 24 +- code/_onclick/hud/xeno/xeno.dm | 4 +- code/_onclick/telekinesis.dm | 8 +- code/datums/components/deployable_item.dm | 2 +- code/datums/components/harvester.dm | 2 +- code/datums/components/shield.dm | 6 +- code/datums/components/stun_mitigation.dm | 2 +- code/datums/elements/strippable.dm | 8 +- .../campaign/loadout_items/SOM/back_slot.dm | 2 +- .../campaign/loadout_items/SOM/belt.dm | 18 +- .../campaign/loadout_items/SOM/head.dm | 16 +- .../campaign/loadout_items/SOM/pockets.dm | 64 +- .../campaign/loadout_items/SOM/secondaries.dm | 34 +- .../campaign/loadout_items/SOM/suit.dm | 16 +- .../SOM/suit_storage/engineer.dm | 114 ++-- .../SOM/suit_storage/field_commander.dm | 144 ++--- .../loadout_items/SOM/suit_storage/medic.dm | 104 +-- .../SOM/suit_storage/squad_leader.dm | 112 ++-- .../SOM/suit_storage/standard.dm | 294 ++++----- .../loadout_items/SOM/suit_storage/veteran.dm | 284 ++++---- .../campaign/loadout_items/SOM/uniform.dm | 12 +- .../campaign/loadout_items/_TGMC/back_slot.dm | 28 +- .../campaign/loadout_items/_TGMC/head.dm | 20 +- .../campaign/loadout_items/_TGMC/pockets.dm | 40 +- .../loadout_items/_TGMC/secondaries.dm | 98 +-- .../campaign/loadout_items/_TGMC/suit.dm | 26 +- .../loadout_items/_TGMC/suit_storage.dm | 28 +- .../_TGMC/suit_storage/corpsman.dm | 164 ++--- .../_TGMC/suit_storage/engineer.dm | 30 +- .../_TGMC/suit_storage/field_commander.dm | 248 +++---- .../_TGMC/suit_storage/marine.dm | 604 +++++++++--------- .../_TGMC/suit_storage/smartgunner.dm | 70 +- .../_TGMC/suit_storage/squad_leader.dm | 238 +++---- .../campaign/loadout_items/_TGMC/uniform.dm | 12 +- .../campaign/loadout_items/secondary.dm | 34 +- .../campaign/loadout_items/secondary_types.dm | 62 +- .../gamemodes/campaign/outfit_holder.dm | 4 +- code/datums/loadout/loadout.dm | 10 +- code/datums/loadout/loadout_helper.dm | 4 +- .../effects/landmarks/corpsespawner.dm | 26 +- code/game/objects/items.dm | 329 +++++----- code/game/objects/items/blink_drive.dm | 2 +- code/game/objects/items/handcuffs.dm | 8 +- code/game/objects/items/jetpack.dm | 2 +- code/game/objects/items/marine_gear.dm | 4 +- code/game/objects/items/megaphone.dm | 2 +- code/game/objects/items/radio/headset.dm | 2 +- code/game/objects/items/storage/backpack.dm | 6 +- code/game/objects/items/storage/belt.dm | 6 +- code/game/objects/items/storage/fancy.dm | 4 +- code/game/objects/items/storage/holsters.dm | 4 +- code/game/objects/items/storage/pouch.dm | 6 +- code/game/objects/machinery/OpTable.dm | 2 +- code/modules/admin/verbs/selectequipment.dm | 2 +- code/modules/client/preferences_gear.dm | 84 ++- code/modules/client/preferences_savefile.dm | 9 +- code/modules/client/preferences_ui.dm | 4 +- code/modules/clothing/clothing.dm | 4 +- code/modules/clothing/glasses/glasses.dm | 6 +- code/modules/clothing/glasses/hud.dm | 2 +- code/modules/clothing/masks/gasmask.dm | 2 +- .../clothing/modular_armor/attachments.dm | 4 +- .../modular_armor/attachments/cape.dm | 2 +- .../modular_armor/attachments/modules.dm | 24 +- .../modules/clothing/modular_armor/modular.dm | 4 +- code/modules/clothing/modular_armor/som.dm | 12 - code/modules/clothing/suits/marine_armor.dm | 10 +- code/modules/clothing/suits/miscellaneous.dm | 2 +- code/modules/clothing/under/marine_uniform.dm | 6 - code/modules/logging/log_category.dm | 4 +- code/modules/logging/log_entry.dm | 20 +- code/modules/logging/log_holder.dm | 10 +- code/modules/mob/inventory.dm | 20 +- .../mob/living/carbon/human/_species.dm | 65 +- .../living/carbon/human/human_attackhand.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 8 +- .../mob/living/carbon/human/inventory.dm | 387 ++++++----- .../human/species_types/combat_robots.dm | 14 +- .../carbon/human/species_types/zombies.dm | 8 +- .../mob/living/carbon/human/update_icons.dm | 12 +- code/modules/mob/living/carbon/inventory.dm | 39 +- .../castes/runner/abilities_runner.dm | 6 +- .../living/carbon/xenomorph/facehuggers.dm | 4 +- .../mob/living/carbon/xenomorph/saddles.dm | 6 +- .../mob/living/carbon/xenomorph/xenomorph.dm | 10 +- code/modules/mob/mob.dm | 87 ++- .../projectiles/gun_attachables/rail.dm | 2 +- code/modules/projectiles/gun_helpers.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/projectiles/guns/rifles.dm | 2 +- .../reagent_containers/food/snacks.dm | 2 +- .../vehicles/mecha/mecha_mob_interaction.dm | 2 +- .../PlayerPreferences/DrawOrder.tsx | 2 +- 97 files changed, 2480 insertions(+), 2227 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 42fba7d2ce85e..0d1105af407ed 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -226,9 +226,7 @@ #define ITEM_SLOT_HANDCUFF (1<<14) //the slot for handcuffs #define ITEM_SLOT_L_HAND (1<<15) //left hand #define ITEM_SLOT_R_HAND (1<<16) //right hand - #define ITEM_SLOT_HANDS (ITEM_SLOT_L_HAND|ITEM_SLOT_R_HAND) //a combo of the above -#define ITEM_SLOT_ACTIVE_STORAGE (1<<17) // the currently open/active storage container -#define ITEM_SLOT_SECONDARY (1<<18) //campaign loadouts only +#define ITEM_SLOT_SECONDARY (1<<17) //campaign loadouts only ///Inventory slot bits to plain english strings GLOBAL_LIST_INIT(inventory_slots_to_string, list( @@ -252,8 +250,44 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( "[ITEM_SLOT_SECONDARY]" = "Secondary", )) +//================================================= + +//Inventory slots - These are mostly used to get items from certain slots +//Text strings so that the slots can be associated when doing inventory lists. +#define SLOT_WEAR_ID 1 +#define SLOT_EARS 2 +#define SLOT_W_UNIFORM 3 +#define SLOT_SHOES 4 +#define SLOT_GLOVES 5 +#define SLOT_BELT 6 +#define SLOT_WEAR_SUIT 7 +#define SLOT_GLASSES 8 +#define SLOT_WEAR_MASK 9 +#define SLOT_HEAD 10 +#define SLOT_BACK 11 +#define SLOT_L_STORE 12 +#define SLOT_R_STORE 13 +#define SLOT_ACCESSORY 14 +#define SLOT_S_STORE 15 +#define SLOT_L_HAND 16 +#define SLOT_R_HAND 17 +#define SLOT_HANDCUFFED 18 +#define SLOT_IN_BOOT 19 +#define SLOT_IN_BACKPACK 20 +#define SLOT_IN_SUIT 21 +#define SLOT_IN_ACCESSORY 23 +#define SLOT_IN_HOLSTER 24 +#define SLOT_IN_B_HOLSTER 25 +#define SLOT_IN_S_HOLSTER 26 +#define SLOT_IN_STORAGE 27 +#define SLOT_IN_L_POUCH 28 +#define SLOT_IN_R_POUCH 29 +#define SLOT_IN_HEAD 30 +#define SLOT_IN_BELT 31 +//================================================= -//Inventory slot strings. These are used for icons and the loadout vendor. + +//Inventory slot strings. These are used for icons. (and checking if an item can be equipped in loadouts for some reason??) #define slot_back_str "slot_back" #define slot_l_hand_str "slot_l_hand" #define slot_r_hand_str "slot_r_hand" @@ -271,28 +305,101 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define slot_s_store_str "slot_s_store" #define slot_l_store_str "slot_l_store" #define slot_r_store_str "slot_r_store" +#define slot_tie_str "slot_tie" ///Correspondance between slot strings and slot numbers GLOBAL_LIST_INIT(slot_str_to_slot, list( - "slot_back" = ITEM_SLOT_BACK, - "slot_l_hand" = ITEM_SLOT_L_HAND, - "slot_r_hand" = ITEM_SLOT_R_HAND, - "slot_w_uniform" = ITEM_SLOT_ICLOTHING, - "slot_head" = ITEM_SLOT_HEAD, - "slot_suit" = ITEM_SLOT_OCLOTHING, - "slot_ear" = ITEM_SLOT_EARS, - "slot_belt" = ITEM_SLOT_BELT, - "slot_shoes" = ITEM_SLOT_FEET, - "slot_wear_mask" = ITEM_SLOT_MASK, - "slot_handcuffed" = ITEM_SLOT_HANDCUFF, - "slot_wear_id" = ITEM_SLOT_ID, - "slot_gloves" = ITEM_SLOT_GLOVES, - "slot_glasses" = ITEM_SLOT_EYES, - "slot_s_store" = ITEM_SLOT_SUITSTORE, - "slot_l_store" = ITEM_SLOT_L_POCKET, - "slot_r_store" = ITEM_SLOT_R_POCKET, + "slot_back" = SLOT_BACK, + "slot_l_hand" = SLOT_L_HAND, + "slot_r_hand" = SLOT_R_HAND, + "slot_w_uniform" = SLOT_W_UNIFORM, + "slot_head" = SLOT_HEAD, + "slot_suit" = SLOT_WEAR_SUIT, + "slot_ear" = SLOT_EARS, + "slot_belt" = SLOT_BELT, + "slot_shoes" = SLOT_SHOES, + "slot_wear_mask" = SLOT_WEAR_MASK, + "slot_handcuffed" = SLOT_HANDCUFFED, + "slot_wear_id" = SLOT_WEAR_ID, + "slot_gloves" = SLOT_GLOVES, + "slot_glasses" = SLOT_GLASSES, + "slot_s_store" = SLOT_S_STORE, + "slot_l_store" = SLOT_L_STORE, + "slot_r_store" = SLOT_R_STORE, + "slot_tie" = SLOT_ACCESSORY, )) +//I hate that this has to exist +/proc/slotdefine2slotbit(slotdefine) //Keep this up to date with the value of SLOT BITMASKS and SLOTS (the two define sections above) + . = 0 + switch(slotdefine) + if(SLOT_BACK) + . = ITEM_SLOT_BACK + if(SLOT_WEAR_MASK) + . = ITEM_SLOT_MASK + if(SLOT_BELT) + . = ITEM_SLOT_BELT + if(SLOT_WEAR_ID) + . = ITEM_SLOT_ID + if(SLOT_EARS) + . = ITEM_SLOT_EARS + if(SLOT_GLASSES) + . = ITEM_SLOT_EYES + if(SLOT_GLOVES) + . = ITEM_SLOT_GLOVES + if(SLOT_HEAD) + . = ITEM_SLOT_HEAD + if(SLOT_SHOES) + . = ITEM_SLOT_FEET + if(SLOT_WEAR_SUIT) + . = ITEM_SLOT_OCLOTHING + if(SLOT_S_STORE) + . = ITEM_SLOT_SUITSTORE + if(SLOT_W_UNIFORM) + . = ITEM_SLOT_ICLOTHING + if(SLOT_R_STORE) + . = ITEM_SLOT_R_POCKET + if(SLOT_L_STORE) + . = ITEM_SLOT_L_POCKET + +/proc/slotbit2slotdefine(slotbit) + . = 0 + switch(slotbit) + if(ITEM_SLOT_OCLOTHING) + . = SLOT_WEAR_SUIT + if(ITEM_SLOT_ICLOTHING) + . = SLOT_W_UNIFORM + if(ITEM_SLOT_GLOVES) + . = SLOT_GLOVES + if(ITEM_SLOT_EYES) + . = SLOT_GLASSES + if(ITEM_SLOT_EARS) + . = SLOT_EARS + if(ITEM_SLOT_MASK) + . = SLOT_WEAR_MASK + if(ITEM_SLOT_HEAD) + . = SLOT_HEAD + if(ITEM_SLOT_FEET) + . = SLOT_SHOES + if(ITEM_SLOT_ID) + . = SLOT_WEAR_ID + if(ITEM_SLOT_BELT) + . = SLOT_BELT + if(ITEM_SLOT_BACK) + . = SLOT_BACK + if(ITEM_SLOT_R_POCKET) + . = SLOT_R_STORE + if(ITEM_SLOT_L_POCKET) + . = SLOT_L_STORE + if(ITEM_SLOT_SUITSTORE) + . = SLOT_S_STORE + if(ITEM_SLOT_HANDCUFF) + . = SLOT_HANDCUFFED + if(ITEM_SLOT_L_HAND) + . = SLOT_L_HAND + if(ITEM_SLOT_R_HAND) + . = SLOT_R_HAND + //================================================= // bitflags for clothing parts //thermal_protection_flags @@ -362,111 +469,199 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( #define WEIGHT_CLASS_HUGE 5 //Usually represents objects that require two hands to operate, ex: Shotgun, Two Handed Melee Weapons #define WEIGHT_CLASS_GIGANTIC 6 //Essentially means it cannot be picked up or placed in an inventory, ex: Mech Parts, Safe +#define SLOT_EQUIP_ORDER list(\ + SLOT_WEAR_ID,\ + SLOT_GLASSES,\ + SLOT_W_UNIFORM,\ + SLOT_ACCESSORY,\ + SLOT_WEAR_SUIT,\ + SLOT_WEAR_MASK,\ + SLOT_HEAD,\ + SLOT_SHOES,\ + SLOT_GLOVES,\ + SLOT_EARS,\ + SLOT_BELT,\ + SLOT_IN_BOOT,\ + SLOT_IN_L_POUCH,\ + SLOT_IN_R_POUCH,\ + SLOT_IN_HEAD,\ + SLOT_IN_ACCESSORY,\ + SLOT_IN_HOLSTER,\ + SLOT_IN_S_HOLSTER,\ + SLOT_IN_B_HOLSTER,\ + SLOT_BACK,\ + SLOT_S_STORE,\ + SLOT_L_STORE,\ + SLOT_R_STORE,\ + SLOT_IN_STORAGE,\ + SLOT_IN_SUIT,\ + SLOT_IN_BELT,\ + SLOT_IN_BACKPACK\ + ) + ///Each slot you can draw from, used and messed with in your preferences. #define SLOT_DRAW_ORDER list(\ - ITEM_SLOT_SUITSTORE,\ - ITEM_SLOT_OCLOTHING,\ - ITEM_SLOT_ICLOTHING,\ - ITEM_SLOT_BELT,\ - ITEM_SLOT_BACK,\ - ITEM_SLOT_L_POCKET,\ - ITEM_SLOT_R_POCKET,\ - ITEM_SLOT_FEET,\ - ITEM_SLOT_ACTIVE_STORAGE,\ - ITEM_SLOT_HEAD,\ + SLOT_IN_HOLSTER,\ + SLOT_IN_S_HOLSTER,\ + SLOT_IN_B_HOLSTER,\ + SLOT_IN_BACKPACK, \ + SLOT_IN_ACCESSORY,\ + SLOT_S_STORE,\ + SLOT_IN_L_POUCH,\ + SLOT_IN_R_POUCH,\ + SLOT_BELT,\ + SLOT_IN_BELT,\ + SLOT_WEAR_SUIT,\ + SLOT_IN_STORAGE,\ + SLOT_L_STORE,\ + SLOT_R_STORE,\ + SLOT_BACK,\ + SLOT_IN_BOOT,\ + SLOT_IN_HEAD\ ) -/// A list of all slots, generally used for looping through all slots. #define SLOT_ALL list(\ - ITEM_SLOT_ID,\ - ITEM_SLOT_EARS,\ - ITEM_SLOT_ICLOTHING,\ - ITEM_SLOT_FEET,\ - ITEM_SLOT_GLOVES,\ - ITEM_SLOT_BELT,\ - ITEM_SLOT_OCLOTHING,\ - ITEM_SLOT_EYES,\ - ITEM_SLOT_MASK,\ - ITEM_SLOT_HEAD,\ - ITEM_SLOT_BACK,\ - ITEM_SLOT_L_POCKET,\ - ITEM_SLOT_R_POCKET,\ - ITEM_SLOT_SUITSTORE,\ - ITEM_SLOT_L_HAND,\ - ITEM_SLOT_R_HAND,\ - ITEM_SLOT_HANDCUFF,\ + SLOT_WEAR_ID,\ + SLOT_EARS,\ + SLOT_W_UNIFORM,\ + SLOT_SHOES,\ + SLOT_GLOVES,\ + SLOT_BELT,\ + SLOT_WEAR_SUIT,\ + SLOT_GLASSES,\ + SLOT_WEAR_MASK,\ + SLOT_HEAD,\ + SLOT_BACK,\ + SLOT_L_STORE,\ + SLOT_R_STORE,\ + SLOT_ACCESSORY,\ + SLOT_S_STORE,\ + SLOT_L_HAND,\ + SLOT_R_HAND,\ + SLOT_HANDCUFFED,\ + SLOT_IN_BOOT,\ + SLOT_IN_BACKPACK,\ + SLOT_IN_SUIT,\ + SLOT_IN_ACCESSORY,\ + SLOT_IN_HOLSTER,\ + SLOT_IN_B_HOLSTER,\ + SLOT_IN_S_HOLSTER,\ + SLOT_IN_STORAGE,\ + SLOT_IN_L_POUCH,\ + SLOT_IN_R_POUCH,\ + SLOT_IN_HEAD,\ + SLOT_IN_BELT,\ ) /// A list of equip slots that are valid for quick equip preferences #define VALID_EQUIP_SLOTS list(\ - ITEM_SLOT_SUITSTORE,\ - ITEM_SLOT_OCLOTHING,\ - ITEM_SLOT_ICLOTHING,\ - ITEM_SLOT_BELT,\ - ITEM_SLOT_BACK,\ - ITEM_SLOT_L_POCKET,\ - ITEM_SLOT_R_POCKET,\ - ITEM_SLOT_FEET,\ - ITEM_SLOT_ACTIVE_STORAGE,\ - ITEM_SLOT_HEAD,\ + SLOT_S_STORE,\ + SLOT_WEAR_SUIT,\ + SLOT_BELT,\ + SLOT_BACK,\ + SLOT_IN_BACKPACK,\ + SLOT_IN_BOOT,\ + SLOT_IN_HEAD,\ + SLOT_L_STORE,\ + SLOT_R_STORE,\ + SLOT_IN_ACCESSORY,\ + SLOT_IN_BELT,\ + SLOT_IN_HOLSTER,\ + SLOT_IN_S_HOLSTER,\ + SLOT_IN_B_HOLSTER,\ ) +#define ITEM_NOT_EQUIPPED 0 +#define ITEM_EQUIPPED_CARRIED 1 //To hands, a storage or the likes. +#define ITEM_EQUIPPED_WORN 2 //Actually worn on the body. + #define SLOT_FLUFF_DRAW list(\ - "Uniform",\ - "Suit",\ "Suit Storage",\ - "Head",\ - "Boot",\ - "Back",\ + "Suit Inside",\ "Belt",\ - "Right Pocket",\ + "Back",\ + "Boot",\ + "Helmet",\ "Left Pocket",\ - "Active storage",\ + "Right Pocket",\ + "Webbing",\ + "Belt Inside",\ + "Belt Holster",\ + "Suit Storage Holster",\ + "Back Holster",\ ) /proc/slot_fluff_to_flag(slot) switch(slot) - if("Uniform") - return ITEM_SLOT_ICLOTHING - if("Suit") - return ITEM_SLOT_OCLOTHING if("Suit Storage") - return ITEM_SLOT_SUITSTORE - if("Head") - return ITEM_SLOT_HEAD - if("Boot") - return ITEM_SLOT_FEET - if("Back") - return ITEM_SLOT_BACK + return SLOT_S_STORE + if("Suit Inside") + return SLOT_WEAR_SUIT if("Belt") - return ITEM_SLOT_BELT - if("Right Pocket") - return ITEM_SLOT_R_POCKET + return SLOT_BELT + if("Back") + return SLOT_BACK + if("Boot") + return SLOT_IN_BOOT + if("Backpack") + return SLOT_IN_BACKPACK + if("Helmet") + return SLOT_IN_HEAD if("Left Pocket") - return ITEM_SLOT_L_POCKET + return SLOT_L_STORE + if("Left Pocket Inside") + return SLOT_IN_L_POUCH + if("Right Pocket") + return SLOT_R_STORE + if("Right Pocket Inside") + return SLOT_IN_R_POUCH + if("Webbing") + return SLOT_IN_ACCESSORY + if("Belt Inside") + return SLOT_IN_BELT + if("Belt Holster") + return SLOT_IN_HOLSTER + if("Suit Storage Holster") + return SLOT_IN_S_HOLSTER + if("Back Holster") + return SLOT_IN_B_HOLSTER if("Active Storage") - return ITEM_SLOT_ACTIVE_STORAGE + return SLOT_IN_STORAGE /proc/slot_flag_to_fluff(slot) switch(slot) - if(ITEM_SLOT_ICLOTHING) - return "Uniform" - if(ITEM_SLOT_OCLOTHING) - return "Suit" - if(ITEM_SLOT_SUITSTORE) + if(SLOT_S_STORE) return "Suit Storage" - if(ITEM_SLOT_HEAD) - return "Head" - if(ITEM_SLOT_FEET) - return "Boot" - if(ITEM_SLOT_BACK) - return "Back" - if(ITEM_SLOT_BELT) + if(SLOT_WEAR_SUIT) + return "Suit Inside" + if(SLOT_BELT) return "Belt" - if(ITEM_SLOT_R_POCKET) - return "Right Pocket" - if(ITEM_SLOT_L_POCKET) + if(SLOT_IN_BELT) + return "Belt Inside" + if(SLOT_BACK) + return "Back" + if(SLOT_IN_BOOT) + return "Boot" + if(SLOT_IN_BACKPACK) + return "Backpack" + if(SLOT_IN_HEAD) + return "Helmet" + if(SLOT_L_STORE) return "Left Pocket" - if(ITEM_SLOT_ACTIVE_STORAGE) + if(SLOT_IN_L_POUCH) + return "Left Pocket Inside" + if(SLOT_R_STORE) + return "Right Pocket" + if(SLOT_IN_R_POUCH) + return "Right Pocket Inside" + if(SLOT_IN_ACCESSORY) + return "Webbing" + if(SLOT_IN_HOLSTER) + return "Belt Holster" + if(SLOT_IN_S_HOLSTER) + return "Suit Storage Holster" + if(SLOT_IN_B_HOLSTER) + return "Back Holster" + if(SLOT_IN_STORAGE) return "Active Storage" diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index f95a9d3b2c118..2353c3efec764 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -320,7 +320,7 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur"))) #define isxenohive(A) ((A == XENO_HIVE_NONE) || (A == XENO_HIVE_NORMAL) || (A == XENO_HIVE_CORRUPTED) || (A == XENO_HIVE_ALPHA) || (A == XENO_HIVE_BETA) || (A == XENO_HIVE_ZETA) || (A == XENO_HIVE_ADMEME)) || (A == XENO_HIVE_FALLEN) // Slot helpers -#define ishandslot(A) (A & ITEM_SLOT_HANDS) +#define ishandslot(A) ((A == SLOT_L_HAND) || (A == SLOT_R_HAND)) // Objective helpers #define ismaroonobjective(O) (istype(O, /datum/objective/maroon)) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 5802dabb07cad..bed73f19846a1 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -185,11 +185,11 @@ ///The default Quick equip order list, adding/removing slots from this list will increase the amount of quick equip slots. Update the define above when #define QUICK_EQUIP_ORDER list(\ - ITEM_SLOT_SUITSTORE,\ - ITEM_SLOT_BELT,\ - ITEM_SLOT_FEET,\ - ITEM_SLOT_L_POCKET,\ - ITEM_SLOT_R_POCKET\ + SLOT_S_STORE,\ + SLOT_BELT,\ + SLOT_IN_BOOT,\ + SLOT_L_STORE,\ + SLOT_R_STORE\ ) #define BE_SPECIAL_FLAGS list(\ diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index 816e7014a2e6a..140baaac15a60 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -246,7 +246,7 @@ /mob/living/carbon/human/p_they(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -254,7 +254,7 @@ /mob/living/carbon/human/p_their(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -262,7 +262,7 @@ /mob/living/carbon/human/p_them(capitalized, temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -270,7 +270,7 @@ /mob/living/carbon/human/p_have(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -278,7 +278,7 @@ /mob/living/carbon/human/p_are(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -286,7 +286,7 @@ /mob/living/carbon/human/p_were(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -294,7 +294,7 @@ /mob/living/carbon/human/p_do(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -302,7 +302,7 @@ /mob/living/carbon/human/p_s(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() @@ -310,6 +310,6 @@ /mob/living/carbon/human/p_es(temp_gender) var/list/obscured = check_obscured_slots() var/skipface = (wear_mask?.inv_hide_flags & HIDEFACE || head?.inv_hide_flags & HIDEFACE) - if((ITEM_SLOT_ICLOTHING & obscured) && skipface) + if((SLOT_W_UNIFORM & obscured) && skipface) temp_gender = PLURAL return ..() diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index fbbc94be443ad..7044e233df29a 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -90,7 +90,7 @@ inv_box = new /atom/movable/screen/inventory/hand/right(null, src) inv_box.icon = ui_style - inv_box.slot_id = ITEM_SLOT_R_HAND + inv_box.slot_id = SLOT_R_HAND inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.update_icon() @@ -100,7 +100,7 @@ inv_box = new /atom/movable/screen/inventory/hand/left(null, src) inv_box.setDir(EAST) inv_box.icon = ui_style - inv_box.slot_id = ITEM_SLOT_L_HAND + inv_box.slot_id = SLOT_L_HAND inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.update_icon() @@ -270,12 +270,12 @@ if(H.back) H.back.screen_loc = ui_back screenmob.client.screen += H.back - if(H.l_pocket) - H.l_pocket.screen_loc = ui_storage1 - screenmob.client.screen += H.l_pocket - if(H.r_pocket) - H.r_pocket.screen_loc = ui_storage2 - screenmob.client.screen += H.r_pocket + if(H.l_store) + H.l_store.screen_loc = ui_storage1 + screenmob.client.screen += H.l_store + if(H.r_store) + H.r_store.screen_loc = ui_storage2 + screenmob.client.screen += H.r_store else if(H.s_store) screenmob.client.screen -= H.s_store @@ -285,10 +285,10 @@ screenmob.client.screen -= H.belt if(H.back) screenmob.client.screen -= H.back - if(H.l_pocket) - screenmob.client.screen -= H.l_pocket - if(H.r_pocket) - screenmob.client.screen -= H.r_pocket + if(H.l_store) + screenmob.client.screen -= H.l_store + if(H.r_store) + screenmob.client.screen -= H.r_store if(hud_version != HUD_STYLE_NOHUD) if(H.r_hand) diff --git a/code/_onclick/hud/xeno/xeno.dm b/code/_onclick/hud/xeno/xeno.dm index 662da06edac28..4380d1f191772 100644 --- a/code/_onclick/hud/xeno/xeno.dm +++ b/code/_onclick/hud/xeno/xeno.dm @@ -71,7 +71,7 @@ inv_box = new /atom/movable/screen/inventory/hand/right(null, src) inv_box.icon = 'icons/mob/screen/alien.dmi' using.alpha = ui_alpha - inv_box.slot_id = ITEM_SLOT_R_HAND + inv_box.slot_id = SLOT_R_HAND inv_box.update_icon() r_hand_hud_object = inv_box static_inventory += inv_box @@ -79,7 +79,7 @@ inv_box = new /atom/movable/screen/inventory/hand/left(null, src) inv_box.icon = 'icons/mob/screen/alien.dmi' using.alpha = ui_alpha - inv_box.slot_id = ITEM_SLOT_L_HAND + inv_box.slot_id = SLOT_L_HAND inv_box.update_icon() l_hand_hud_object = inv_box static_inventory += inv_box diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 1b4ebde112e23..563d8cedd19f0 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -118,9 +118,11 @@ Redefine as needed. //stops TK grabs being equipped anywhere but into hands /obj/item/tk_grab/equipped(mob/user, slot) . = ..() - if(slot & ITEM_SLOT_POCKET) - return - qdel(src) + switch(slot) + if(SLOT_L_HAND, SLOT_R_HAND) + return + else + qdel(src) /obj/item/tk_grab/examine(user) diff --git a/code/datums/components/deployable_item.dm b/code/datums/components/deployable_item.dm index 81f444cd20b07..4f4e90311e966 100644 --- a/code/datums/components/deployable_item.dm +++ b/code/datums/components/deployable_item.dm @@ -36,7 +36,7 @@ ///Register click signals to be ready for deploying /datum/component/deployable_item/proc/register_for_deploy_signal(obj/item/item_equipped, mob/user, slot) SIGNAL_HANDLER - if(!(slot & ITEM_SLOT_HANDS)) + if(slot != SLOT_L_HAND && slot != SLOT_R_HAND) return RegisterSignal(user, COMSIG_MOB_MOUSEDOWN, PROC_REF(deploy)) RegisterSignal(item_equipped, COMSIG_ITEM_UNEQUIPPED, PROC_REF(unregister_signals)) diff --git a/code/datums/components/harvester.dm b/code/datums/components/harvester.dm index 216c3b9bb93e8..bd96dfcca5185 100644 --- a/code/datums/components/harvester.dm +++ b/code/datums/components/harvester.dm @@ -295,7 +295,7 @@ item_parent.update_appearance(UPDATE_ICON) loaded_reagent = null var/parent_slot = reagent_select_action.owner.get_equipped_slot(parent) - if(parent_slot & ITEM_SLOT_L_HAND) + if(parent_slot == SLOT_L_HAND) reagent_select_action.owner.update_inv_l_hand() else reagent_select_action.owner.update_inv_r_hand() diff --git a/code/datums/components/shield.dm b/code/datums/components/shield.dm index d7ffd44e0d2c8..a35106694b3c6 100644 --- a/code/datums/components/shield.dm +++ b/code/datums/components/shield.dm @@ -10,7 +10,7 @@ ///Behavior flags var/shield_flags = NONE ///What slots the parent item provides its shield effects in - var/slot_flags = ITEM_SLOT_HANDS + var/slot_flags = list(SLOT_L_HAND, SLOT_R_HAND) ///Shield priority layer var/layer = 50 ///Is the shield currently active @@ -80,7 +80,7 @@ ///Handles equipping the shield /datum/component/shield/proc/shield_equipped(datum/source, mob/living/user, slot) SIGNAL_HANDLER - if(!(slot & ITEM_SLOT_HANDS)) + if(!(slot in slot_flags)) shield_detach_from_user() return shield_affect_user(user) @@ -209,7 +209,7 @@ /datum/component/shield/overhealth layer = 100 cover = list(MELEE = 0, BULLET = 80, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 0, ACID = 80) - slot_flags = ITEM_SLOT_OCLOTHING //For now it only activates while worn on a single place, meaning only one active at a time. Need to handle overlays properly to allow for stacking. + slot_flags = list(SLOT_WEAR_SUIT) //For now it only activates while worn on a single place, meaning only one active at a time. Need to handle overlays properly to allow for stacking. var/max_shield_integrity = 100 var/shield_integrity = 100 var/recharge_rate = 1 SECONDS diff --git a/code/datums/components/stun_mitigation.dm b/code/datums/components/stun_mitigation.dm index e4f246fdee189..b931c7dd7d91b 100644 --- a/code/datums/components/stun_mitigation.dm +++ b/code/datums/components/stun_mitigation.dm @@ -5,7 +5,7 @@ ///Any special behavior flags var/shield_flags = NONE ///The slots in which the parent can be in for the component to apply - var/slot_flags = ITEM_SLOT_HANDS + var/slot_flags = SLOT_L_HAND|SLOT_R_HAND ///Whether the component is currently active var/active = TRUE diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 2b7ecec60ba96..023298852d75c 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -197,7 +197,7 @@ return null var/mob/mob_source = source - return mob_source.get_item_by_slot(item_slot) + return mob_source.get_item_by_slot_bit(item_slot) /datum/strippable_item/mob_item_slot/try_equip(atom/source, obj/item/equipping, mob/user) . = ..() @@ -207,7 +207,7 @@ if(!ismob(source)) return FALSE - if(!equipping.mob_can_equip(source, item_slot, TRUE, FALSE, FALSE)) + if(!equipping.mob_can_equip(source, item_slot, warning = TRUE, override_nodrop = FALSE, bitslot = TRUE)) to_chat(user, "\The [equipping] doesn't fit in that place!") return FALSE @@ -224,7 +224,7 @@ if(!do_after(user, get_equip_delay(equipping), NONE, source, BUSY_ICON_FRIENDLY)) return FALSE - if(!equipping.mob_can_equip(source, item_slot, TRUE, FALSE, FALSE)) + if(!equipping.mob_can_equip(source, item_slot,warning = TRUE,override_nodrop = FALSE, bitslot = TRUE)) return FALSE if(!user.temporarilyRemoveItemFromInventory(equipping)) @@ -237,7 +237,7 @@ return FALSE var/mob/mob_source = source - mob_source.equip_to_slot(equipping, item_slot, FALSE) + mob_source.equip_to_slot(equipping, item_slot, TRUE) /datum/strippable_item/mob_item_slot/get_obscuring(atom/source) if(iscarbon(source)) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm index d0524b3e556e7..a8642935dbd82 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm @@ -67,7 +67,7 @@ /datum/loadout_item/back/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, ITEM_SLOT_R_HAND) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_R_HAND) /datum/loadout_item/back/som_rocket_bag name = "RPG bag" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm index e9bc164706945..35465c7c4b236 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm @@ -50,15 +50,15 @@ /datum/loadout_item/belt/som/grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BELT, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) /datum/loadout_item/belt/som/pistol_holster name = "Pistol holster" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm index e9570feb08399..c6be710f1f498 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm @@ -9,8 +9,8 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/helmet/som_standard/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) /datum/loadout_item/helmet/som_veteran name = "Veteran helmet" @@ -59,16 +59,16 @@ loadout_item_flags = NONE /datum/loadout_item/helmet/som_tyr/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) /datum/loadout_item/helmet/som_tyr/engineer jobs_supported = list(SOM_SQUAD_ENGINEER) loadout_item_flags = NONE /datum/loadout_item/helmet/som_tyr/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) /datum/loadout_item/helmet/som_tyr/universal jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) @@ -90,5 +90,5 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/som_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm index 13390f082ae37..9177f7bcb81c3 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm @@ -48,12 +48,12 @@ item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) /datum/loadout_item/r_pocket/war_crime_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_R_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/som_shotgun name = "Buckshot shells" @@ -63,10 +63,10 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/r_pocket/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/som_construction name = "Construction pouch" @@ -76,10 +76,10 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/r_pocket/som_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_R_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/som_magazine name = "Mag pouch-P" @@ -162,12 +162,12 @@ item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) /datum/loadout_item/l_pocket/war_crime_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/som_shotgun name = "Flechette shells" @@ -177,10 +177,10 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/l_pocket/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/som_construction name = "Construction pouch" @@ -190,20 +190,20 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) /datum/loadout_item/l_pocket/som_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/som_construction/engineer desc = "A pouch containing additional metal, plasteel and barbed wire. Allows for the rapid establishment of fortified positions." jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/l_pocket/som_construction/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/som_magazine name = "Mag pouch-S" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/secondaries.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/secondaries.dm index 6b53533ee7f86..8e06e403e7afa 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/secondaries.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/secondaries.dm @@ -64,8 +64,8 @@ req_desc = "Requires a VX-42 or VX-33P." /datum/loadout_item/secondary/gun/som/sawn_off/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new item_typepath(wearer), ITEM_SLOT_BELT, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, ITEM_SLOT_L_HAND) + wearer.equip_to_slot_or_del(new item_typepath(wearer), SLOT_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_L_HAND) default_load(wearer, loadout, holder) /datum/loadout_item/secondary/esword @@ -78,7 +78,7 @@ loadout_item_flags = NONE /datum/loadout_item/secondary/esword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new item_typepath(wearer), ITEM_SLOT_BELT, TRUE, TRUE) + wearer.equip_to_slot_or_del(new item_typepath(wearer), SLOT_IN_BELT) default_load(wearer, loadout, holder) //kits @@ -86,19 +86,19 @@ jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_LEADER, SOM_SQUAD_VETERAN, SOM_FIELD_COMMANDER) /datum/loadout_item/secondary/kit/he_nades/som/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/binoculars/som jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN) /datum/loadout_item/secondary/kit/binoculars/som/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/crowbar, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/som_engineer jobs_supported = list(SOM_SQUAD_ENGINEER) @@ -120,9 +120,9 @@ ui_icon = "claymore" /datum/loadout_item/secondary/kit/som_engineer/large_mines/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/som_engineer/materials name = "Metal/plasteel" @@ -130,9 +130,9 @@ ui_icon = "materials" /datum/loadout_item/secondary/kit/som_engineer/materials/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/som_corpsman jobs_supported = list(SOM_SQUAD_CORPSMAN) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm index 5a0e80bd904c0..3738de96769a1 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm @@ -21,8 +21,8 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/som_light_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_light_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/som/light/shield_overclocked/engineer @@ -59,8 +59,8 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/som_medium_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_medium_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/som/shield_overclocked/engineer @@ -133,8 +133,8 @@ req_desc = null /datum/loadout_item/suit_slot/som_heavy_tyr/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_heavy_tyr/engineer item_typepath = /obj/item/clothing/suit/modular/som/heavy/lorica/engineer @@ -216,8 +216,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/som_medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_medic/light name = "L armor" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm index 8814798f671bc..dd2e0681ed7f4 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm @@ -2,11 +2,11 @@ jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/suit_store/main_gun/som_engineer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle name = "V-31" @@ -23,16 +23,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/engineerpack/som)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/enhanced name = "V-31+" @@ -56,16 +56,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/engineerpack/som)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_engineer/carbine name = "V-34" @@ -80,16 +80,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/engineerpack/som)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_engineer/smg name = "V-21" @@ -105,18 +105,18 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/engineerpack/som)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_engineer/smg/enhanced name = "V-21+" @@ -142,18 +142,18 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/engineerpack/som)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_engineer/volkite_charger name = "VX-32 charger" @@ -171,13 +171,13 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/engineerpack/som)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm index c2832fc4baffc..0d3fb4a625acb 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm @@ -2,11 +2,11 @@ jobs_supported = list(SOM_FIELD_COMMANDER) /datum/loadout_item/suit_store/main_gun/som_field_commander/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_field_commander/standard_rifle name = "V-31" @@ -23,15 +23,15 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_field_commander/smg name = "V-21" @@ -47,16 +47,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_charger name = "VX-32 charger" @@ -72,14 +72,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_caliver name = "VX-33 caliver" @@ -96,14 +96,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_field_commander/mpi name = "MPi-KM" @@ -118,14 +118,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_field_commander/carbine name = "V-34" @@ -141,14 +141,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/fc_boarding_axe name = "Boarding axe" @@ -161,22 +161,22 @@ jobs_supported = list(SOM_FIELD_COMMANDER) /datum/loadout_item/suit_store/fc_boarding_axe/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm index f6187515d6740..4ba8c8a0ab0b9 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm @@ -16,14 +16,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/enhanced name = "V-31+" @@ -47,14 +47,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/carbine name = "V-34" @@ -69,14 +69,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/smg name = "V-21" @@ -92,16 +92,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/smg/enhanced name = "V-21+" @@ -127,16 +127,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/volkite_charger name = "VX-32 charger" @@ -154,11 +154,11 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm index 59d09f446641b..63df5efa75d7f 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm @@ -2,11 +2,11 @@ jobs_supported = list(SOM_SQUAD_LEADER) /datum/loadout_item/suit_store/main_gun/som_squad_leader/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_squad_leader/standard_rifle name = "V-31" @@ -23,15 +23,15 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_squad_leader/smg name = "V-21" @@ -47,16 +47,16 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_squad_leader/big_rifle name = "V-35" @@ -108,14 +108,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_caliver name = "VX-33 caliver" @@ -132,14 +132,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_squad_leader/mpi name = "MPi-KM" @@ -154,14 +154,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_squad_leader/carbine name = "V-34" @@ -177,11 +177,11 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm index 3a1ecabb19e23..1a4b9e794dc10 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm @@ -2,11 +2,11 @@ jobs_supported = list(SOM_SQUAD_MARINE) /datum/loadout_item/suit_store/main_gun/som_marine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle name = "V-31" @@ -24,21 +24,21 @@ if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced name = "V-31+" @@ -51,7 +51,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return ..() /datum/loadout_item/suit_store/main_gun/som_marine/mpi_grenadier @@ -66,14 +66,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/carbine name = "V-34" @@ -88,14 +88,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/smg name = "V-21" @@ -116,23 +116,23 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced name = "V-21+" @@ -145,7 +145,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/smg/som/ap /datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return ..() /datum/loadout_item/suit_store/main_gun/som_marine/standard_shotgun @@ -167,28 +167,28 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(istype(secondary) && !isholster(wearer.belt)) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/flamer name = "V-62 incinerator" @@ -203,26 +203,26 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(istype(secondary) && !isholster(wearer.belt)) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield name = "V-21 & riot shield" @@ -236,27 +236,27 @@ /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, ITEM_SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/enhanced name = "V-21+ & riot shield" @@ -279,22 +279,22 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/machinegunner/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/big_rifle name = "V-35" @@ -349,21 +349,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/boarding_axe name = "Boarding axe" @@ -378,26 +378,26 @@ jobs_supported = list(SOM_SQUAD_MARINE) /datum/loadout_item/suit_store/boarding_axe/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle name = "V-31-suppressed" @@ -414,21 +414,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced name = "V-31-suppressed+" @@ -442,5 +442,5 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return ..() diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm index eb54af803060a..0e488c58fcecc 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm @@ -2,11 +2,11 @@ jobs_supported = list(SOM_SQUAD_VETERAN) /datum/loadout_item/suit_store/main_gun/som_veteran/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle name = "V-31" @@ -23,21 +23,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/smg name = "V-21" @@ -53,23 +53,23 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/breacher name = "VX-32B charger" @@ -84,25 +84,25 @@ /datum/loadout_item/suit_store/main_gun/som_veteran/breacher/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, ITEM_SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) if(istype(wearer.back, /obj/item/storage)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/breacher/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger name = "VX-32 charger" @@ -118,22 +118,22 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver name = "VX-33 caliver" @@ -149,22 +149,22 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/mpi name = "MPi-KM" @@ -179,14 +179,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/carbine name = "V-34" @@ -202,14 +202,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver_pack name = "VX-33P Caliver" @@ -226,11 +226,11 @@ item_whitelist = list(/obj/item/cell/lasgun/volkite/powerpack = ITEM_SLOT_BACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver_pack/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_culverin name = "VX-42 culverin" @@ -248,11 +248,11 @@ item_whitelist = list(/obj/item/cell/lasgun/volkite/powerpack = ITEM_SLOT_BACK) /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_culverin/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/som_veteran/radioactive_smg name = "V-21R" @@ -268,40 +268,40 @@ secondary_ammo_type = /obj/item/ammo_magazine/smg/som/rad /datum/loadout_item/suit_store/main_gun/som_veteran/radioactive_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_L_POCKET, FALSE, TRUE) - if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_L_POUCH) + if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_R_POUCH) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/energy_sword name = "Energy sword" @@ -312,32 +312,32 @@ jobs_supported = list(SOM_SQUAD_VETERAN) /datum/loadout_item/suit_store/energy_sword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(istype(secondary) && !isholster(wearer.belt)) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm index 8638d66789bd9..c87a8c1f471e6 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm @@ -28,12 +28,12 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/uniform/som_medic/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/roller, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big/combatmix, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big/combatmix, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) //engineer /datum/loadout_item/uniform/som_engineer diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm index 9081b19383459..e4dae7d59bae4 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm @@ -95,7 +95,7 @@ /datum/loadout_item/back/marine_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, ITEM_SLOT_R_HAND) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_R_HAND) /datum/loadout_item/back/tgmc_heam_rocket_bag name = "HEAM rocket bag" @@ -151,9 +151,9 @@ /datum/loadout_item/back/engineerpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) /datum/loadout_item/back/tgmc_rocket_bag name = "Rocket bag" @@ -173,16 +173,16 @@ /datum/loadout_item/back/tech_backpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) //smartgunner /datum/loadout_item/back/sg_minigun_powerpack diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm index 7efa4baade0b0..4b0aff23b9234 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm @@ -3,8 +3,8 @@ ui_icon = "helmet" /datum/loadout_item/helmet/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) /datum/loadout_item/helmet/empty name = "no helmet" @@ -119,16 +119,16 @@ loadout_item_flags = NONE /datum/loadout_item/helmet/tyr/corpsman/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) /datum/loadout_item/helmet/tyr/engineer jobs_supported = list(SQUAD_ENGINEER) loadout_item_flags = NONE /datum/loadout_item/helmet/tyr/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) /datum/loadout_item/helmet/tyr/universal jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) @@ -149,8 +149,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/mimir/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) /datum/loadout_item/helmet/engineer name = "Engi Helmet" @@ -160,8 +160,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_HEAD, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) /datum/loadout_item/helmet/field_commander_beret name = "FC beret" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm index c39379379281d..497fbad89c05d 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm @@ -75,10 +75,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/r_pocket/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, ITEM_SLOT_R_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/marine_construction name = "Construction pouch" @@ -88,10 +88,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/r_pocket/marine_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_R_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/magazine name = "Mag pouch-P" @@ -197,10 +197,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/l_pocket/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/marine_construction name = "Construction pouch" @@ -210,20 +210,20 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) /datum/loadout_item/l_pocket/marine_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/marine_construction/engineer desc = "A pouch containing additional metal, plasteel and barbed wire. Allows for the rapid establishment of fortified positions." jobs_supported = list(SQUAD_ENGINEER) /datum/loadout_item/l_pocket/marine_construction/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/magazine name = "Mag pouch-S" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/secondaries.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/secondaries.dm index 9578843c17733..6a819d730ee56 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/secondaries.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/secondaries.dm @@ -118,19 +118,19 @@ /datum/loadout_item/secondary/gun/marine/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() var/datum/loadout_item/suit_store/main_gun/primary = holder.equipped_things["[ITEM_SLOT_SUITSTORE]"] - var/obj/item/storage/pouch/magazine/mag_pouch = wearer.r_pocket + var/obj/item/storage/pouch/magazine/mag_pouch = wearer.r_store var/ammo_type = /obj/item/ammo_magazine/smg/m25 if(istype(mag_pouch) && (!istype(primary) || !(primary.ammo_type in mag_pouch.storage_datum.can_hold))) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, TRUE, TRUE) - mag_pouch = wearer.l_pocket + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + mag_pouch = wearer.l_store if(wearer.skills.getRating(SKILL_SMGS) >= SKILL_SMGS_TRAINED) ammo_type = /obj/item/ammo_magazine/smg/m25/ap if(istype(mag_pouch) && (!istype(primary) || !(primary.ammo_type in mag_pouch.storage_datum.can_hold))) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) /datum/loadout_item/secondary/gun/marine/db_shotgun name = "SH-34 shotgun" @@ -156,7 +156,7 @@ req_desc = "Requires a scabbard." /datum/loadout_item/secondary/machete/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new item_typepath(wearer), ITEM_SLOT_BELT) + wearer.equip_to_slot_or_del(new item_typepath(wearer), SLOT_IN_HOLSTER) default_load(wearer, loadout, holder) /datum/loadout_item/secondary/machete/officer @@ -176,10 +176,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_LEADER, SQUAD_SMARTGUNNER, FIELD_COMMANDER) /datum/loadout_item/secondary/kit/mirage_nades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/he_nades name = "HE nades" @@ -188,10 +188,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_LEADER, SQUAD_SMARTGUNNER, FIELD_COMMANDER) /datum/loadout_item/secondary/kit/he_nades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/deploy_shield name = "Deployable shield" @@ -200,9 +200,9 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_LEADER, SQUAD_SMARTGUNNER, FIELD_COMMANDER) /datum/loadout_item/secondary/kit/deploy_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/binoculars name = "Tac binos" @@ -212,10 +212,10 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER) /datum/loadout_item/secondary/kit/binoculars/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/crowbar, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/cameras name = "Cameras" @@ -224,10 +224,10 @@ jobs_supported = list(SQUAD_LEADER) /datum/loadout_item/secondary/kit/cameras/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_engineer jobs_supported = list(SQUAD_ENGINEER) @@ -239,9 +239,9 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/secondary/kit/tgmc_engineer/sentry/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_engineer/large_mines name = "Claymores" @@ -249,9 +249,9 @@ ui_icon = "claymore" /datum/loadout_item/secondary/kit/tgmc_engineer/large_mines/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_engineer/materials name = "Metal/plasteel" @@ -259,9 +259,9 @@ ui_icon = "materials" /datum/loadout_item/secondary/kit/tgmc_engineer/materials/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_engineer/detpack name = "Detpacks" @@ -269,13 +269,13 @@ ui_icon = "default" /datum/loadout_item/secondary/kit/tgmc_engineer/detpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/tech)) - wearer.equip_to_slot_or_del(new /obj/item/detpack, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_engineer/razorburn name = "Razorburn" @@ -283,10 +283,10 @@ ui_icon = "default" /datum/loadout_item/secondary/kit/tgmc_engineer/razorburn/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_engineer/iguana name = "Iguana" @@ -296,9 +296,9 @@ purchase_cost = 75 /datum/loadout_item/secondary/kit/tgmc_engineer/iguana/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/deployable_vehicle, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/uav_turret, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/unmanned_vehicle_remote, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_vehicle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/uav_turret, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/unmanned_vehicle_remote, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/tgmc_corpsman jobs_supported = list(SQUAD_CORPSMAN) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm index 2d8e98a0a78d0..0721a56d71cff 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm @@ -2,11 +2,11 @@ item_slot = ITEM_SLOT_OCLOTHING /datum/loadout_item/suit_slot/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/empty name = "no suit" @@ -52,8 +52,8 @@ jobs_supported = list(SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/light_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/light_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/tdf/light/shield_overclocked/engineer @@ -85,8 +85,8 @@ jobs_supported = list(SQUAD_CORPSMAN) /datum/loadout_item/suit_slot/medium_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/medium_shield/overclocked/engineer item_typepath = /obj/item/clothing/suit/modular/tdf/shield_overclocked/engineer @@ -165,8 +165,8 @@ req_desc = null /datum/loadout_item/suit_slot/heavy_tyr/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/heavy_tyr/engineer item_typepath = /obj/item/clothing/suit/modular/tdf/heavy/tyr_two/engineer @@ -219,8 +219,8 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/medium_mimir/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_OCLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/defibrillator, ITEM_SLOT_OCLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) //engineer /datum/loadout_item/suit_slot/medium_engineer diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm index 797b4f8e3d897..c72c7543f3f21 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm @@ -45,17 +45,17 @@ if(!ammo_type) return if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - if(istype(wearer.l_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - if(istype(wearer.r_pocket, /obj/item/storage/pouch/magazine)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm index 2567280b5ce59..ca1fa9bba8069 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm @@ -13,15 +13,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/laser_rifle name = "Laser rifle" @@ -35,15 +35,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/auto_shotgun name = "SH-15" @@ -58,15 +58,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/skirmish_rifle name = "AR-21" desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. \ @@ -79,15 +79,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/standard_smg name = "SMG-25" @@ -100,17 +100,17 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/standard_smg/enhanced name = "SMG-25+" @@ -130,15 +130,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/carbine/enhanced name = "AR-18+" @@ -159,15 +159,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/enhanced name = "AR-12+" @@ -189,15 +189,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/plasma_smg name = "PL-51" @@ -213,15 +213,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/corpsman/plasma_rifle name = "PL-38" @@ -237,12 +237,12 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm index 99667aabf78f3..e9197aae09fea 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm @@ -2,11 +2,11 @@ jobs_supported = list(SQUAD_ENGINEER) /datum/loadout_item/suit_store/main_gun/engineer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/engineer/carbine name = "AR-18" @@ -33,11 +33,11 @@ /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/enhanced name = "AR-12+" @@ -57,11 +57,11 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette /datum/loadout_item/suit_store/main_gun/engineer/auto_shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/engineer/combat_rifle name = "AR-11" diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm index 4ecb9c73f68fe..a69d40bbc9b1e 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm @@ -7,28 +7,28 @@ jobs_supported = list(FIELD_COMMANDER) /datum/loadout_item/suit_store/officer_sword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/fc_pistol name = "P-1911A1-C pistol" @@ -39,44 +39,44 @@ jobs_supported = list(FIELD_COMMANDER) /datum/loadout_item/suit_store/fc_pistol/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander jobs_supported = list(FIELD_COMMANDER) /datum/loadout_item/suit_store/main_gun/field_commander/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/field_commander/pulse_rifle name = "PR-11" @@ -88,19 +88,19 @@ /datum/loadout_item/suit_store/main_gun/field_commander/pulse_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/combat_rifle name = "AR-11" @@ -114,14 +114,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/laser_rifle name = "Laser rifle" @@ -133,19 +133,19 @@ /datum/loadout_item/suit_store/main_gun/field_commander/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/laser_mg name = "Laser machinegun" @@ -157,19 +157,19 @@ /datum/loadout_item/suit_store/main_gun/field_commander/laser_mg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle name = "AR-12" @@ -181,18 +181,18 @@ /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/enhanced name = "AR-12+" @@ -211,18 +211,18 @@ /datum/loadout_item/suit_store/main_gun/field_commander/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/carbine/enhanced name = "AR-18+" @@ -245,15 +245,15 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle name = "PL-38" @@ -267,16 +267,16 @@ /datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm index 4bd0f8522dba8..93ef9f7b3f24f 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm @@ -2,11 +2,11 @@ jobs_supported = list(SQUAD_MARINE) /datum/loadout_item/suit_store/main_gun/marine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/standard_rifle name = "AR-12" @@ -21,14 +21,14 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced name = "AR-12+" @@ -39,7 +39,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap /datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return ..() /datum/loadout_item/suit_store/main_gun/marine/laser_rifle @@ -54,21 +54,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_laser_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/standard_carbine name = "AR-18" @@ -81,14 +81,14 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced name = "AR-18+" @@ -98,7 +98,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap /datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return ..() /datum/loadout_item/suit_store/main_gun/marine/combat_rifle @@ -113,21 +113,21 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/combat_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/battle_rifle name = "BR-64" @@ -140,14 +140,14 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/skirmish_rifle name = "AR-21" @@ -161,14 +161,14 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/alf name = "ALF-51B" @@ -182,22 +182,22 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/alf/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/standard_gpmg name = "MG-60" @@ -211,28 +211,28 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_gpmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/standard_mmg name = "MG-27" @@ -247,28 +247,28 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_mmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/laser_mg name = "Laser machinegun" @@ -282,21 +282,21 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/laser_mg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/flamer name = "FL-84" @@ -313,29 +313,29 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/shotgun name = "SH-35" @@ -352,27 +352,27 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(istype(secondary) && !isholster(wearer.belt)) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/auto_shotgun name = "SH-15" @@ -387,14 +387,14 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/laser_carbine name = "Laser carbine" @@ -408,22 +408,22 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/laser_carbine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/scout_carbine name = "AR-18-scout" @@ -442,15 +442,15 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/scout_carbine/enhanced name = "AR-18-S+" @@ -472,18 +472,18 @@ /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, ITEM_SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, SLOT_L_HAND) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/enhanced name = "SMG-25+ & riot shield" @@ -505,24 +505,24 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(istype(wearer.belt, /obj/item/storage/belt)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/standard_smg/enhanced name = "SMG-25+" @@ -550,33 +550,33 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(istype(secondary) && !isholster(wearer.belt)) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/scout_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, ITEM_SLOT_BELT, FALSE, TRUE) - - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, SLOT_IN_BELT) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine name = "AR-18-Suppressed" @@ -590,14 +590,14 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced name = "AR-18-Suppressed+" @@ -608,7 +608,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return ..() /datum/loadout_item/suit_store/main_gun/marine/mag_gl @@ -625,32 +625,32 @@ . = ..() if(!isstorageobj(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(istype(secondary) && !isholster(wearer.belt)) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/dense, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/razor, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/dense, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/razor, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/mag_gl/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(istype(wearer.belt, /obj/item/storage/belt)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) - - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/binoculars, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/plasma_smg name = "PL-51" @@ -666,21 +666,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/plasma_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/plasma_rifle name = "PL-38" @@ -696,21 +696,21 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/plasma_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/plasma_cannon name = "PL-96" @@ -727,20 +727,20 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/plasma_cannon/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/minigun name = "MG-100" @@ -754,19 +754,19 @@ item_whitelist = list(/obj/item/ammo_magazine/minigun_powerpack = ITEM_SLOT_BACK) /datum/loadout_item/suit_store/main_gun/marine/minigun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) //notguns /datum/loadout_item/suit_store/machete_shield @@ -780,26 +780,26 @@ /datum/loadout_item/suit_store/machete_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() - wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, ITEM_SLOT_L_HAND) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, SLOT_L_HAND) if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/machete_shield/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm index a3733645a7955..a085a89d634ea 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm @@ -2,18 +2,18 @@ jobs_supported = list(SQUAD_SMARTGUNNER) /datum/loadout_item/suit_store/main_gun/smartgunner/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/smartgunner/smartmachinegun name = "SG-29" @@ -29,14 +29,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/smartgunner/smart_minigun name = "SG-85" @@ -50,9 +50,9 @@ /datum/loadout_item/suit_store/main_gun/smartgunner/smart_minigun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() if(loadout.belt == /obj/item/storage/belt/sparepouch) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, ITEM_SLOT_BELT, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, ITEM_SLOT_BELT, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, ITEM_SLOT_BELT, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) /datum/loadout_item/suit_store/main_gun/smartgunner/smarttargetrifle name = "SG-62" @@ -66,27 +66,27 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/smartgunner/smarttargetrifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm index c5a1991639763..b4326b9a8021a 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm @@ -2,17 +2,17 @@ jobs_supported = list(SQUAD_LEADER) /datum/loadout_item/suit_store/main_gun/squad_leader/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) var/datum/loadout_item/secondary/gun/secondary = holder.equipped_things["[ITEM_SLOT_SECONDARY]"] if(!istype(secondary) || isstorageobj(wearer.back) || (isholster(wearer.belt) && !istype(wearer.belt, /obj/item/storage/holster/m25))) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_ACCESSORY) return - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary.secondary_weapon_ammo, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle name = "AR-12" @@ -24,18 +24,18 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/enhanced name = "AR-12+" @@ -56,19 +56,19 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/carbine name = "AR-18" @@ -79,18 +79,18 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/carbine/enhanced name = "AR-18+" @@ -111,14 +111,14 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/battle_rifle @@ -130,18 +130,18 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/battle_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/auto_shotgun name = "SH-15" @@ -154,19 +154,19 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/oicw name = "AR-55" @@ -183,30 +183,30 @@ . = ..() if(!isstorageobj(wearer.back)) return - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/oicw/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) . = ..() if(loadout.belt == /obj/item/storage/belt/marine) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BELT, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_BELT, FALSE, TRUE) - if(loadout.l_pocket == /obj/item/storage/pouch/magazine/large) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_L_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_L_POCKET, FALSE, TRUE) - if(loadout.r_pocket == /obj/item/storage/pouch/magazine/large) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_R_POCKET, FALSE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, ITEM_SLOT_R_POCKET, FALSE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + if(loadout.l_store == /obj/item/storage/pouch/magazine/large) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_L_POUCH) + if(loadout.r_store == /obj/item/storage/pouch/magazine/large) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_R_POUCH) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg name = "SMG-25" @@ -217,20 +217,20 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/enhanced name = "SMG-25+" @@ -253,15 +253,15 @@ if(!isstorageobj(wearer.back)) return ..() . = ..() - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle name = "PL-38" @@ -275,16 +275,16 @@ /datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) if(!isstorageobj(wearer.back)) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) return ..() . = ..() - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm index 3e94a48bc2253..2b2011c250009 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm @@ -49,12 +49,12 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/uniform/marine_corpsman/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/roller, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big/combatmix, ITEM_SLOT_ICLOTHING, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, ITEM_SLOT_ICLOTHING, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big/combatmix, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) //engineer /datum/loadout_item/uniform/marine_engineer diff --git a/code/datums/gamemodes/campaign/loadout_items/secondary.dm b/code/datums/gamemodes/campaign/loadout_items/secondary.dm index d908924a6c102..0a49fa0d965be 100644 --- a/code/datums/gamemodes/campaign/loadout_items/secondary.dm +++ b/code/datums/gamemodes/campaign/loadout_items/secondary.dm @@ -17,23 +17,23 @@ /datum/loadout_item/secondary/proc/default_load(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) var/datum/loadout_item/suit_store/main_gun/primary = holder.equipped_things["[ITEM_SLOT_SUITSTORE]"] if(istype(primary)) - wearer.equip_to_slot_or_del(new primary.ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new primary.secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new primary.ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new primary.secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) return - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) switch(wearer.faction) if(FACTION_SOM) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) else - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/empty name = "None" @@ -79,10 +79,10 @@ if(isholster(wearer.belt)) var/obj/item/storage/holster/holster = wearer.belt - wearer.equip_to_slot_or_del(new item_typepath(wearer), ITEM_SLOT_BELT) + wearer.equip_to_slot_or_del(new item_typepath(wearer), SLOT_IN_HOLSTER) gun_spawned = TRUE for(var/i = 1 to holster.storage_datum.max_storage_space) - if(!wearer.equip_to_slot_or_del(new secondary_weapon_ammo, ITEM_SLOT_BELT)) + if(!wearer.equip_to_slot_or_del(new secondary_weapon_ammo, SLOT_IN_HOLSTER)) break ammo_spawned = TRUE @@ -90,11 +90,11 @@ return if(!gun_spawned) - wearer.equip_to_slot_or_del(new item_typepath(wearer), ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new item_typepath(wearer), SLOT_IN_BACKPACK) if(ammo_spawned) default_load(wearer, loadout, holder) for(var/i = 1 to 10) - if(!wearer.equip_to_slot_or_del(new secondary_weapon_ammo, ITEM_SLOT_BACK, TRUE, TRUE)) + if(!wearer.equip_to_slot_or_del(new secondary_weapon_ammo, SLOT_IN_BACKPACK)) break - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) //because secondary fills last, there should only be space if secondary ammo is w_class 3, or the loadout naturally has spare space + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) //because secondary fills last, there should only be space if secondary ammo is w_class 3, or the loadout naturally has spare space diff --git a/code/datums/gamemodes/campaign/loadout_items/secondary_types.dm b/code/datums/gamemodes/campaign/loadout_items/secondary_types.dm index 4e5d2a1c80b74..7128dddf99622 100644 --- a/code/datums/gamemodes/campaign/loadout_items/secondary_types.dm +++ b/code/datums/gamemodes/campaign/loadout_items/secondary_types.dm @@ -36,9 +36,9 @@ var/datum/loadout_item/suit_store/main_gun/primary = holder.equipped_things["[ITEM_SLOT_SUITSTORE]"] if(!istype(primary)) return - wearer.equip_to_slot_or_del(new primary.ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new primary.secondary_ammo_type, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new primary.ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new primary.secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/primary_ammo/default jobs_supported = list(SQUAD_CORPSMAN, SOM_SQUAD_CORPSMAN) @@ -51,10 +51,10 @@ purchase_cost = 20 /datum/loadout_item/secondary/kit/emp_nades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/emp, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/stun_nades name = "Stun nades" @@ -62,10 +62,10 @@ ui_icon = "stun_nade" /datum/loadout_item/secondary/kit/stun_nades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/sandbags name = "Sandbags" @@ -73,9 +73,9 @@ ui_icon = "construction" /datum/loadout_item/secondary/kit/sandbags/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/throwing_knives name = "Throwing knives" @@ -83,13 +83,13 @@ ui_icon = "default" /datum/loadout_item/secondary/kit/throwing_knives/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/throwing_knife, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/plastique name = "C4 pack" @@ -97,13 +97,13 @@ ui_icon = "default" /datum/loadout_item/secondary/kit/plastique/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) /datum/loadout_item/secondary/kit/anti_tank name = "Anti-tank" @@ -112,6 +112,6 @@ purchase_cost = 30 /datum/loadout_item/secondary/kit/anti_tank/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout, datum/outfit_holder/holder) - wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/rocket/oneuse/anti_tank, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/antitank, ITEM_SLOT_BACK, TRUE, TRUE) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, ITEM_SLOT_BACK, TRUE, TRUE) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/rocket/oneuse/anti_tank, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/antitank, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/outfit_holder.dm b/code/datums/gamemodes/campaign/outfit_holder.dm index 7536888ec83a9..38c72e8e87ffe 100644 --- a/code/datums/gamemodes/campaign/outfit_holder.dm +++ b/code/datums/gamemodes/campaign/outfit_holder.dm @@ -114,9 +114,9 @@ if(ITEM_SLOT_BACK) loadout.back = new_item?.item_typepath if(ITEM_SLOT_R_POCKET) - loadout.r_pocket = new_item?.item_typepath + loadout.r_store = new_item?.item_typepath if(ITEM_SLOT_L_POCKET) - loadout.l_pocket = new_item?.item_typepath + loadout.l_store = new_item?.item_typepath if(ITEM_SLOT_SUITSTORE) loadout.suit_store = new_item?.item_typepath if(ITEM_SLOT_SECONDARY) diff --git a/code/datums/loadout/loadout.dm b/code/datums/loadout/loadout.dm index f31326cd2f11a..89f3570107461 100644 --- a/code/datums/loadout/loadout.dm +++ b/code/datums/loadout/loadout.dm @@ -37,7 +37,7 @@ if(slot_belt_str) if(!(equip_slot_flags & ITEM_SLOT_BELT)) return FALSE - if(!item_list[ITEM_SLOT_ICLOTHING]) + if(!item_list[SLOT_W_UNIFORM]) return FALSE return TRUE if(slot_glasses_str) @@ -47,19 +47,19 @@ if(slot_w_uniform_str) return (equip_slot_flags & ITEM_SLOT_ICLOTHING) if(slot_l_store_str) - if(!item_list[ITEM_SLOT_ICLOTHING]) + if(!item_list[SLOT_W_UNIFORM]) return FALSE if(w_class <= 2 || (equip_slot_flags & ITEM_SLOT_POCKET)) return TRUE if(slot_r_store_str) - if(!item_list[ITEM_SLOT_ICLOTHING]) + if(!item_list[SLOT_W_UNIFORM]) return FALSE if(w_class <= 2 || (equip_slot_flags & ITEM_SLOT_POCKET)) return TRUE if(slot_s_store_str) - if(!item_list[ITEM_SLOT_ICLOTHING]) + if(!item_list[SLOT_W_UNIFORM]) return FALSE - var/obj/item/jumpsuit = item_list[ITEM_SLOT_ICLOTHING] + var/obj/item/jumpsuit = item_list[SLOT_W_UNIFORM] if(!jumpsuit.allowed) return FALSE if(jumpsuit.allowed.Find(item_type)) diff --git a/code/datums/loadout/loadout_helper.dm b/code/datums/loadout/loadout_helper.dm index 85b48d519d988..f25ea448920d1 100644 --- a/code/datums/loadout/loadout_helper.dm +++ b/code/datums/loadout/loadout_helper.dm @@ -124,11 +124,11 @@ if(user.wear_ear) return if(user.job.outfit.ears) - user.equip_to_slot_or_del(new user.job.outfit.ears(user), ITEM_SLOT_EARS, override_nodrop = TRUE) + user.equip_to_slot_or_del(new user.job.outfit.ears(user), SLOT_EARS, override_nodrop = TRUE) return if(!user.assigned_squad) return - user.equip_to_slot_or_del(new /obj/item/radio/headset/mainship/marine(null, user.assigned_squad, user.job.type), ITEM_SLOT_EARS, override_nodrop = TRUE) + user.equip_to_slot_or_del(new /obj/item/radio/headset/mainship/marine(null, user.assigned_squad, user.job.type), SLOT_EARS, override_nodrop = TRUE) /// Will check if the selected category can be bought according to the category choices left /proc/can_buy_category(category, category_choices) diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index 5b6a0d4c8195e..036dc5b930c4b 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -82,29 +82,29 @@ /obj/effect/landmark/corpsespawner/proc/equip_items_to_mob(mob/living/carbon/human/corpse) if(corpseuniform) - corpse.equip_to_slot_or_del(new corpseuniform(corpse), ITEM_SLOT_ICLOTHING) + corpse.equip_to_slot_or_del(new corpseuniform(corpse), SLOT_W_UNIFORM) if(corpsesuit) - corpse.equip_to_slot_or_del(new corpsesuit(corpse), ITEM_SLOT_OCLOTHING) + corpse.equip_to_slot_or_del(new corpsesuit(corpse), SLOT_WEAR_SUIT) if(corpseshoes) - corpse.equip_to_slot_or_del(new corpseshoes(corpse), ITEM_SLOT_FEET) + corpse.equip_to_slot_or_del(new corpseshoes(corpse), SLOT_SHOES) if(corpsegloves) - corpse.equip_to_slot_or_del(new corpsegloves(corpse), ITEM_SLOT_GLOVES) + corpse.equip_to_slot_or_del(new corpsegloves(corpse), SLOT_GLOVES) if(corpseradio) - corpse.equip_to_slot_or_del(new corpseradio(corpse), ITEM_SLOT_EARS) + corpse.equip_to_slot_or_del(new corpseradio(corpse), SLOT_EARS) if(corpseglasses) - corpse.equip_to_slot_or_del(new corpseglasses(corpse), ITEM_SLOT_EYES) + corpse.equip_to_slot_or_del(new corpseglasses(corpse), SLOT_GLASSES) if(corpsemask) - corpse.equip_to_slot_or_del(new corpsemask(corpse), ITEM_SLOT_MASK) + corpse.equip_to_slot_or_del(new corpsemask(corpse), SLOT_WEAR_MASK) if(corpsehelmet) - corpse.equip_to_slot_or_del(new corpsehelmet(corpse), ITEM_SLOT_HEAD) + corpse.equip_to_slot_or_del(new corpsehelmet(corpse), SLOT_HEAD) if(corpsebelt) - corpse.equip_to_slot_or_del(new corpsebelt(corpse), ITEM_SLOT_BELT) + corpse.equip_to_slot_or_del(new corpsebelt(corpse), SLOT_BELT) if(corpsepocket1) - corpse.equip_to_slot_or_del(new corpsepocket1(corpse), ITEM_SLOT_R_POCKET) + corpse.equip_to_slot_or_del(new corpsepocket1(corpse), SLOT_R_STORE) if(corpsepocket2) - corpse.equip_to_slot_or_del(new corpsepocket2(corpse), ITEM_SLOT_L_POCKET) + corpse.equip_to_slot_or_del(new corpsepocket2(corpse), SLOT_L_STORE) if(corpseback) - corpse.equip_to_slot_or_del(new corpseback(corpse), ITEM_SLOT_BACK) + corpse.equip_to_slot_or_del(new corpseback(corpse), SLOT_BACK) if(corpseid) var/obj/item/card/id/newid = new(corpse) newid.name = "[corpse.real_name]'s ID Card" @@ -124,7 +124,7 @@ if(corpseidjob) newid.assignment = corpseidjob newid.registered_name = corpse.real_name - corpse.equip_to_slot_or_del(newid, ITEM_SLOT_ID) + corpse.equip_to_slot_or_del(newid, SLOT_WEAR_ID) // I'll work on making a list of corpses people request for maps, or that I think will be commonly used. Syndicate operatives for example. diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 1ba697ad75de3..ce49c16fac8f9 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -433,7 +433,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan SHOULD_CALL_PARENT(TRUE) // no exceptions SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot) - var/equipped_to_slot = equip_slot_flags & slot + var/equipped_to_slot = equip_slot_flags & slotdefine2slotbit(slot) if(equipped_to_slot) // equip_slot_flags is a bitfield SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_TO_SLOT, user, slot) else @@ -457,11 +457,11 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan ///Called when an item is removed from an equipment slot. The loc should still be in the unequipper. -/obj/item/proc/unequipped(mob/unequipper, slot) ///todo look at +/obj/item/proc/unequipped(mob/unequipper, slot) SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_UNEQUIPPED, unequipper, slot) - var/equipped_from_slot = equip_slot_flags & slot + var/equipped_from_slot = equip_slot_flags & slotdefine2slotbit(slot) for(var/datum/action/A AS in actions) A.remove_action(unequipper) @@ -501,218 +501,217 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan item_flags &= ~CAN_BUMP_ATTACK /** - * Checks if the mob can equip src to the specified slot - * - * Arguments: - * * user - the mob trying to equip src - * * slot - the slot we're trying to equip to - * * warning - does the user get a warning if the equip fails? - * * override_nodrop - do we take into consideration if the item is nodrop? - * * into_storage - are we trying to put src into a storage item in the slot? + * The mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't. + * If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen. + * Set disable_warning to 1 if you wish it to not give you outputs. + * warning_text is used in the case that you want to provide a specific warning for why the item cannot be equipped. + * The bitslot param determines if the flag we've passed is a bitflag or not */ -/obj/item/proc/mob_can_equip(mob/user, slot = NONE, warning = TRUE, override_nodrop = FALSE, into_storage) +/obj/item/proc/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) if(!slot || !user) return FALSE - if(HAS_TRAIT(src, TRAIT_NODROP) && !(slot & ITEM_SLOT_HANDS) && !override_nodrop) //No drops can only be equipped to a hand slot - if(slot & ITEM_SLOT_HANDS) + if(HAS_TRAIT(src, TRAIT_NODROP) && slot != SLOT_L_HAND && slot != SLOT_R_HAND && !override_nodrop) //No drops can only be equipped to a hand slot + if(slot == SLOT_L_HAND || slot == SLOT_R_HAND) to_chat(user, span_notice("[src] is stuck to your hand!")) return FALSE - if(!ishuman(user)) /// apparently other types of mobs are barred from ever having slots + if(!ishuman(user)) return FALSE - var/mob/living/carbon/human/human_user = user - if(!human_user.has_limb_for_slot(slot)) - return + var/mob/living/carbon/human/H = user var/list/mob_equip = list() - if(human_user.species.hud?.equip_slots) - mob_equip = human_user.species.hud.equip_slots + if(H.species.hud?.equip_slots) + mob_equip = H.species.hud.equip_slots + + if(bitslot) + var/old_slot = slot + slot = slotbit2slotdefine(old_slot) - if(human_user.species && !(slot in mob_equip)) + if(H.species && !(slot in mob_equip)) return FALSE - if((slot in human_user.species?.no_equip) && !into_storage) //the no_equip list only applies to actual slots, not storage insertion - if(!is_type_in_list(human_user.species, species_exception)) + if(slot in H.species?.no_equip) + if(!is_type_in_list(H.species, species_exception)) return FALSE - if(issynth(human_user) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use)) - to_chat(human_user, span_warning("Your programming prevents you from wearing this.")) + if(issynth(H) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use)) + to_chat(H, span_warning("Your programming prevents you from wearing this.")) return FALSE - if(into_storage) - switch(slot) - if(ITEM_SLOT_L_HAND) - if(!human_user.l_hand?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_R_HAND) - if(!human_user.r_hand?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_ACTIVE_STORAGE) //open storage - if(!human_user?.s_active?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_ICLOTHING) - if(isclothing(human_user.w_uniform)) - for(var/key AS in human_user.w_uniform.attachments_by_slot) - var/atom/attachment = human_user.w_uniform.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) - return TRUE - return FALSE - if(ITEM_SLOT_OCLOTHING) - if(isclothing(human_user.wear_suit)) - for(var/key AS in human_user.wear_suit.attachments_by_slot) - var/atom/attachment = human_user.wear_suit.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) - return TRUE - return FALSE - if(ITEM_SLOT_HEAD) - if(isclothing(human_user.head)) - for(var/key AS in human_user.head.attachments_by_slot) - var/atom/attachment = human_user.head.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) - return TRUE - return FALSE - if(ITEM_SLOT_FEET) - if(isclothing(human_user.shoes)) - for(var/key AS in human_user.shoes.attachments_by_slot) - var/atom/attachment = human_user.shoes.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - if(attachment.storage_datum.can_be_inserted(src, human_user, FALSE)) - return TRUE - return FALSE - if(ITEM_SLOT_BACK) - if(!human_user.back?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_BELT) - if(!human_user.belt?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_L_POCKET) - if(!human_user.l_pocket?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_R_POCKET) - if(!human_user.r_pocket?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_SUITSTORE) - if(!human_user.s_store?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_HEAD) - if(!human_user.head?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE - if(ITEM_SLOT_FEET) - if(!human_user.shoes?.storage_datum?.can_be_inserted(src, human_user, FALSE)) - return FALSE - return TRUE + var/obj/item/selected_slot //the item in the specific slot we're trying to insert into + var/equip_to_slot = FALSE switch(slot) - if(ITEM_SLOT_L_HAND) - if(human_user.l_hand) + if(SLOT_L_HAND) + if(H.l_hand) return FALSE return TRUE - if(ITEM_SLOT_R_HAND) - if(human_user.r_hand) + if(SLOT_R_HAND) + if(H.r_hand) return FALSE return TRUE - if(ITEM_SLOT_HANDCUFF) - if(human_user.handcuffed) + if(SLOT_HANDCUFFED) + if(H.handcuffed) return FALSE if(!istype(src, /obj/item/restraints/handcuffs)) return FALSE return TRUE - if(ITEM_SLOT_SUITSTORE) //suit storage uniquely depends on the suit allowed list, so is a bit snowflake - if(human_user.s_store) - return FALSE - if(!human_user.wear_suit && (ITEM_SLOT_OCLOTHING in mob_equip)) - if(warning) - to_chat(human_user, span_warning("You need a suit before you can attach this [name].")) + if(SLOT_IN_STORAGE) //open storage + if(!H.s_active) return FALSE - if(is_type_in_list(src, human_user.wear_suit.allowed)) - return TRUE - return FALSE + selected_slot = H.s_active - // from here on we're properly equipping into the actual slots (respecting equip slot flags) - if(!(equip_slot_flags & slot)) - return FALSE - - switch(slot) //actual slots - if(ITEM_SLOT_MASK) - if(human_user.wear_mask) + if(SLOT_WEAR_MASK) + if(H.wear_mask) return FALSE - if(ITEM_SLOT_BACK) - if(human_user.back) + equip_to_slot = TRUE + if(SLOT_BACK) + if(H.back) return FALSE - if(ITEM_SLOT_GLOVES) - if(human_user.gloves) + equip_to_slot = TRUE + if(SLOT_GLOVES) + if(H.gloves) return FALSE - if(ITEM_SLOT_FEET) - if(human_user.shoes) + equip_to_slot = TRUE + if(SLOT_SHOES) + if(H.shoes) return FALSE - if(ITEM_SLOT_EYES) - if(human_user.glasses) + equip_to_slot = TRUE + if(SLOT_GLASSES) + if(H.glasses) return FALSE - if(ITEM_SLOT_HEAD) - if(human_user.head) + equip_to_slot = TRUE + if(SLOT_HEAD) + if(H.head) return FALSE - if(ITEM_SLOT_EARS) - if(human_user.wear_ear) + equip_to_slot = TRUE + if(SLOT_EARS) + if(H.wear_ear) return FALSE - if(ITEM_SLOT_ICLOTHING) - if(human_user.w_uniform) + equip_to_slot = TRUE + if(SLOT_W_UNIFORM) + if(H.w_uniform) return FALSE - if(ITEM_SLOT_ID) - if(human_user.wear_id) + equip_to_slot = TRUE + if(SLOT_WEAR_ID) + if(H.wear_id) return FALSE + equip_to_slot = TRUE //direct slots with prerequisites - if(ITEM_SLOT_OCLOTHING) - if(human_user.wear_suit) + if(SLOT_WEAR_SUIT) + if(H.wear_suit) return FALSE - if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) + if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE - if(ITEM_SLOT_BELT) - if(human_user.belt) + equip_to_slot = TRUE + if(SLOT_BELT) + if(H.belt) return FALSE - if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) + if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE - if(ITEM_SLOT_L_POCKET) - if(human_user.l_pocket) + equip_to_slot = TRUE + if(SLOT_L_STORE) + if(H.l_store) return FALSE - if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) + if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(w_class <= 2) //smaller or tiny items can all go in pocket slots, larger items require the flag to fit return TRUE - if(ITEM_SLOT_R_POCKET) - if(human_user.r_pocket) + equip_to_slot = TRUE + if(SLOT_R_STORE) + if(H.r_store) return FALSE - if(!human_user.w_uniform && (ITEM_SLOT_ICLOTHING in mob_equip)) + if(!H.w_uniform && (SLOT_W_UNIFORM in mob_equip)) if(warning) - to_chat(human_user, span_warning("You need a jumpsuit before you can attach this [name].")) + to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) return FALSE if(w_class <= 2) return TRUE - return TRUE + equip_to_slot = TRUE + if(SLOT_S_STORE) //suit storage uniquely depends on the suit allowed list, so is a bit snowflake + if(H.s_store) + return FALSE + if(!H.wear_suit && (SLOT_WEAR_SUIT in mob_equip)) + if(warning) + to_chat(H, span_warning("You need a suit before you can attach this [name].")) + return FALSE + if(is_type_in_list(src, H.wear_suit.allowed)) + return TRUE + return FALSE + + //storage slot defines + if(SLOT_IN_ACCESSORY) + selected_slot = H.w_uniform + if(SLOT_IN_BACKPACK) + selected_slot = H.back + if(SLOT_IN_BELT) + selected_slot = H.belt + if(SLOT_IN_L_POUCH) + selected_slot = H.l_store + if(SLOT_IN_R_POUCH) + selected_slot = H.r_store + if(SLOT_IN_SUIT) + selected_slot = H.wear_suit + if(SLOT_IN_HEAD) + selected_slot = H.head + if(SLOT_IN_BOOT) + selected_slot = H.shoes + + //holsters - need to check for specific item types + if(SLOT_IN_B_HOLSTER) + if(!H.back || !istype(H.back, /obj/item/storage/holster)) + return FALSE + selected_slot = H.back + if(SLOT_IN_HOLSTER) + if(!H.belt || (!istype(H.belt,/obj/item/storage/holster))) + return FALSE + selected_slot = H.belt + if(SLOT_IN_S_HOLSTER) + if(!H.s_store || (!istype(H.s_store, /obj/item/storage/holster))) + return FALSE + selected_slot = H.s_store + + else + return FALSE //Unsupported slot + + if(equip_to_slot) + if(!(equip_slot_flags & slotdefine2slotbit(slot))) + return FALSE + return TRUE + + if(!selected_slot) + return FALSE + + var/datum/storage/current_storage_datum + + if(isdatumstorage(selected_slot)) + current_storage_datum = selected_slot + + else if(selected_slot.storage_datum) + current_storage_datum = selected_slot.storage_datum + + else if(isclothing(selected_slot)) + var/obj/item/clothing/selected_clothing = selected_slot + for(var/key AS in selected_clothing.attachments_by_slot) + var/atom/attachment = selected_clothing.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + current_storage_datum = attachment.storage_datum + break + + if(!current_storage_datum) + return FALSE + + return current_storage_datum.can_be_inserted(src, user, warning) /// Checks whether the item can be unequipped from owner by stripper. Generates a message on failure and returns TRUE/FALSE /obj/item/proc/canStrip(mob/stripper, mob/owner) @@ -999,23 +998,23 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!ishuman(user)) return TRUE var/safety = user.get_eye_protection() - var/mob/living/carbon/human/human_user = user - var/datum/internal_organ/eyes/E = human_user.get_organ_slot(ORGAN_SLOT_EYES) + var/mob/living/carbon/human/H = user + var/datum/internal_organ/eyes/E = H.get_organ_slot(ORGAN_SLOT_EYES) switch(safety) if(1) E.take_damage(rand(1, 2), TRUE) if(0) E.take_damage(rand(2, 4), TRUE) if(-1) - human_user.blur_eyes(rand(12,20)) + H.blur_eyes(rand(12,20)) E.take_damage(rand(12, 16), TRUE) if(safety<2) if(E.damage >= E.min_broken_damage) - to_chat(human_user, span_danger("You can't see anything!")) - human_user.blind_eyes(1) + to_chat(H, span_danger("You can't see anything!")) + H.blind_eyes(1) else if (E.damage >= E.min_bruised_damage) - to_chat(human_user, span_warning("Your eyes are really starting to hurt. This can't be good for you!")) - human_user.blind_eyes(5) + to_chat(H, span_warning("Your eyes are really starting to hurt. This can't be good for you!")) + H.blind_eyes(5) else switch(safety) if(1) diff --git a/code/game/objects/items/blink_drive.dm b/code/game/objects/items/blink_drive.dm index 56854aaa6f234..cf08618148642 100644 --- a/code/game/objects/items/blink_drive.dm +++ b/code/game/objects/items/blink_drive.dm @@ -55,7 +55,7 @@ /obj/item/blink_drive/equipped(mob/user, slot) . = ..() equipped_user = user - if(slot & ITEM_SLOT_BACK) + if(slot == SLOT_BACK) blink_action.give_action(user) /obj/item/blink_drive/dropped(mob/user) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index d5b96df33a904..e5ac03a04b336 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -35,7 +35,7 @@ return var/mob/living/carbon/human/H = target - if (!H.has_limb_for_slot(ITEM_SLOT_HANDCUFF)) + if (!H.has_limb_for_slot(SLOT_HANDCUFFED)) to_chat(user, span_warning("\The [H] needs at least two wrists before you can cuff them together!")) return @@ -43,9 +43,9 @@ user.visible_message(span_notice("[user] tries to put [src] on [H].")) if(do_after(user, cuff_delay, NONE, H, BUSY_ICON_HOSTILE, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(user, TYPE_PROC_REF(/datum, Adjacent), H)) && !H.handcuffed) - if(H.has_limb_for_slot(ITEM_SLOT_HANDCUFF)) + if(H.has_limb_for_slot(SLOT_HANDCUFFED)) user.dropItemToGround(src) - H.equip_to_slot_if_possible(src, ITEM_SLOT_HANDCUFF, 1, 0, 1, 1) + H.equip_to_slot_if_possible(src, SLOT_HANDCUFFED, 1, 0, 1, 1) return TRUE @@ -127,7 +127,7 @@ if (ishuman(C)) var/mob/living/carbon/human/H = C - if (!H.has_limb_for_slot(ITEM_SLOT_HANDCUFF)) + if (!H.has_limb_for_slot(SLOT_HANDCUFFED)) to_chat(user, span_warning("\The [H] needs at least two wrists before you can cuff them together!")) return diff --git a/code/game/objects/items/jetpack.dm b/code/game/objects/items/jetpack.dm index 927897911fa03..ee4c4b7628176 100644 --- a/code/game/objects/items/jetpack.dm +++ b/code/game/objects/items/jetpack.dm @@ -45,7 +45,7 @@ /obj/item/jetpack_marine/equipped(mob/user, slot) . = ..() - if(slot & ITEM_SLOT_BACK) + if(slot == SLOT_BACK) toggle_action.give_action(user) /obj/item/jetpack_marine/dropped(mob/user) diff --git a/code/game/objects/items/marine_gear.dm b/code/game/objects/items/marine_gear.dm index 6fff935914c1a..450b90f45af67 100644 --- a/code/game/objects/items/marine_gear.dm +++ b/code/game/objects/items/marine_gear.dm @@ -296,7 +296,7 @@ ///Set up the link between belt and object /obj/item/belt_harness/proc/attach_item(obj/item/to_attach, mob/user) - reequip_component = to_attach.AddComponent(/datum/component/reequip, list(ITEM_SLOT_SUITSTORE, ITEM_SLOT_BACK)) + reequip_component = to_attach.AddComponent(/datum/component/reequip, list(SLOT_S_STORE, SLOT_BACK)) RegisterSignals(reequip_component, list(COMSIG_REEQUIP_FAILURE, COMSIG_QDELETING), PROC_REF(detach_item)) playsound(src,'sound/machines/click.ogg', 15, FALSE, 1) to_chat(user, span_notice("[src] clicks as you hook \the [to_attach] into it.")) @@ -328,7 +328,7 @@ /obj/item/belt_harness/marine/equipped(mob/user, slot) . = ..() - if(slot & ITEM_SLOT_BELT) + if(slot == SLOT_BELT) playsound(src,'sound/machines/click.ogg', 15, FALSE, 1) to_chat(user, span_danger("!!REMEMBER TO ATTACH YOUR WEAPON TO YOUR HARNESS OR IT WON'T WORK!!")) diff --git a/code/game/objects/items/megaphone.dm b/code/game/objects/items/megaphone.dm index 5d5ac5a81e4bc..6f9304b6285de 100644 --- a/code/game/objects/items/megaphone.dm +++ b/code/game/objects/items/megaphone.dm @@ -15,7 +15,7 @@ /obj/item/megaphone/equipped(mob/M, slot) . = ..() - if(slot & ITEM_SLOT_HANDS) + if ((slot == SLOT_L_HAND) || (slot == SLOT_R_HAND)) RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm index 0fda8ee61afce..bbbdadf80b050 100644 --- a/code/game/objects/items/radio/headset.dm +++ b/code/game/objects/items/radio/headset.dm @@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( camera = new /obj/machinery/camera/headset(src) /obj/item/radio/headset/mainship/equipped(mob/living/carbon/human/user, slot) - if(slot & ITEM_SLOT_EARS) + if(slot == SLOT_EARS) if(faction && (faction != user.faction) && user.faction != FACTION_NEUTRAL) safety_protocol(user) return diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index fb24e1db1dcd6..97f74b226083e 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -29,7 +29,7 @@ playsound(loc, storage_datum.use_sound, 15, 1, 6) /obj/item/storage/backpack/equipped(mob/user, slot) - if(slot & ITEM_SLOT_BACK) + if(slot == SLOT_BACK) mouse_opacity = 2 //so it's easier to click when properly equipped. if(storage_datum.use_sound) playsound(loc, storage_datum.use_sound, 15, 1, 6) @@ -378,7 +378,7 @@ /obj/item/storage/backpack/marine/duffelbag/equipped(mob/equipper, slot) . = ..() - if(slot & ITEM_SLOT_BACK) + if(slot == SLOT_BACK) RegisterSignal(equipper, COMSIG_CLICK_RIGHT, PROC_REF(on_rclick_duffel_wearer)) RegisterSignal(equipper, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_move)) for(var/mob/M AS in storage_datum.content_watchers) @@ -678,7 +678,7 @@ /obj/item/storage/backpack/marine/satchel/scout_cloak/item_action_slot_check(mob/user, slot) if(!ishuman(user)) return FALSE - if(!(slot & ITEM_SLOT_BACK)) + if(slot != SLOT_BACK) return FALSE return TRUE diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 93a38fa968dd8..488eaed13afd6 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -13,13 +13,13 @@ storage_type = /datum/storage/belt /obj/item/storage/belt/equipped(mob/user, slot) - if(slot & ITEM_SLOT_BELT) + if(slot == SLOT_BELT) mouse_opacity = 2 //so it's easier to click when properly equipped. - return ..() + ..() /obj/item/storage/belt/dropped(mob/user) mouse_opacity = initial(mouse_opacity) - return ..() + ..() /obj/item/storage/belt/vendor_equip(mob/user) ..() diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 9f77db51551c3..ba1a27e3f706b 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -158,7 +158,7 @@ var/obj/item/clothing/mask/cigarette/C = locate() in src if(C) storage_datum.remove_from_storage(C, get_turf(user), user) - user.equip_to_slot_if_possible(C, ITEM_SLOT_MASK) + user.equip_to_slot_if_possible(C, SLOT_WEAR_MASK) to_chat(user, span_notice("You take a cigarette out of the pack.")) update_icon() else @@ -254,7 +254,7 @@ var/obj/item/clothing/mask/cigarette/cigar/C = locate() in src if(C) storage_datum.remove_from_storage(C, get_turf(user), user) - user.equip_to_slot_if_possible(C, ITEM_SLOT_MASK) + user.equip_to_slot_if_possible(C, SLOT_WEAR_MASK) to_chat(user, span_notice("You take a cigar out of the case.")) update_icon() else diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index d48f19f19f042..8653e784d37c8 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -32,7 +32,7 @@ storage_datum.holstered_item_underlay = src.holstered_item_underlay /obj/item/storage/holster/equipped(mob/user, slot) - if(slot & (ITEM_SLOT_BACK|ITEM_SLOT_BELT|ITEM_SLOT_SUITSTORE|ITEM_SLOT_R_POCKET|ITEM_SLOT_L_POCKET)) //add more if needed + if (slot == SLOT_BACK || slot == SLOT_BELT || slot == SLOT_S_STORE || slot == SLOT_L_STORE || slot == SLOT_R_STORE ) //add more if needed mouse_opacity = MOUSE_OPACITY_OPAQUE //so it's easier to click when properly equipped. return ..() @@ -112,7 +112,7 @@ playsound(loc, storage_datum.use_sound, 15, 1, 6) /obj/item/storage/holster/backholster/equipped(mob/user, slot) - if(slot & ITEM_SLOT_BACK) + if (slot == SLOT_BACK) mouse_opacity = MOUSE_OPACITY_OPAQUE //so it's easier to click when properly equipped. if(storage_datum.use_sound) playsound(loc, storage_datum.use_sound, 15, 1, 6) diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 4a82af51ca704..e3f7c1400b637 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -24,13 +24,13 @@ .["pocket attachable"] = "Can be worn by attaching it to a pocket." /obj/item/storage/pouch/equipped(mob/user, slot) - if(slot & ITEM_SLOT_POCKET) + if(slot == SLOT_L_STORE || slot == SLOT_R_STORE) mouse_opacity = 2 //so it's easier to click when properly equipped. - return ..() + ..() /obj/item/storage/pouch/dropped(mob/user) mouse_opacity = initial(mouse_opacity) - return ..() + ..() /obj/item/storage/pouch/vendor_equip(mob/user) ..() diff --git a/code/game/objects/machinery/OpTable.dm b/code/game/objects/machinery/OpTable.dm index 4db68bc32650b..443dfa53def88 100644 --- a/code/game/objects/machinery/OpTable.dm +++ b/code/game/objects/machinery/OpTable.dm @@ -98,7 +98,7 @@ if(buckling_human.wear_mask && !buckling_human.dropItemToGround(buckling_human.wear_mask)) to_chat(user, span_danger("You can't remove their mask!")) return FALSE - if(!buckling_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/medical(buckling_human), ITEM_SLOT_MASK)) + if(!buckling_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/medical(buckling_human), SLOT_WEAR_MASK)) to_chat(user, span_danger("You can't fit the gas mask over their face!")) return FALSE buckling_human.visible_message("[span_notice("[user] fits the mask over [buckling_human]'s face and turns on the anesthetic.")]'") diff --git a/code/modules/admin/verbs/selectequipment.dm b/code/modules/admin/verbs/selectequipment.dm index acce658cc511f..b8e739da1df94 100644 --- a/code/modules/admin/verbs/selectequipment.dm +++ b/code/modules/admin/verbs/selectequipment.dm @@ -211,7 +211,7 @@ qdel(target) else human_target = target - if(human_target.l_pocket || human_target.r_pocket || human_target.s_store) //saves a lot of time for admins and coders alike + if(human_target.l_store || human_target.r_store || human_target.s_store) //saves a lot of time for admins and coders alike if(tgui_alert(usr,"Drop Items in Pockets? No will delete them.", "Robust quick dress shop", list("Yes", "No")) == "No") delete_pocket = TRUE diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index f355a4b45d022..3aa83f85eb024 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -8,242 +8,238 @@ GLOBAL_LIST_INIT(gear_datums, populate_gear_list()) .[G.display_name] = G /datum/gear - /// Name shown - var/display_name - /// Path to item. - var/path - /// Number of points used. - var/cost - /// Slot to equip to. - var/slot + var/display_name //Name/index. + var/path //Path to item. + var/cost //Number of points used. + var/slot //Slot to equip to. /datum/gear/flower display_name = "Flower Pin" path = /obj/item/clothing/head/hairflower cost = 1 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/bandanna_grey display_name = "surplus bandanna (grey)" path = /obj/item/clothing/head/bandanna/grey cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/bandanna_red display_name = "surplus bandanna (red)" path = /obj/item/clothing/head/bandanna/red cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/bandanna_brown display_name = "surplus bandanna (brown)" path = /obj/item/clothing/head/bandanna/brown cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/eye_patch display_name = "Eye Patch" path = /obj/item/clothing/glasses/eyepatch cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/beret display_name = "surplus beret (blue)" path = /obj/item/clothing/head/tgmcberet cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_tan display_name = "surplus beret (tan)" path = /obj/item/clothing/head/tgmcberet/tan cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_green display_name = "surplus beret (green)" path = /obj/item/clothing/head/tgmcberet/green cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_green display_name = "surplus beret (red)" path = /obj/item/clothing/head/tgmcberet/red2 cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_darkgreen display_name = "surplus beret (dark green)" path = /obj/item/clothing/head/tgmcberet/darkgreen cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_bloodred display_name = "surplus beret (blood red)" path = /obj/item/clothing/head/tgmcberet/bloodred cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_bloodred/blue display_name = "surplus beret (dark blue)" path = /obj/item/clothing/head/tgmcberet/blueberet cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/beret_snow display_name = "surplus beret (snow)" path = /obj/item/clothing/head/tgmcberet/snow cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/headband_green display_name = "surplus headband (green)" path = /obj/item/clothing/head/headband cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/headband_red display_name = "surplus headband (red)" path = /obj/item/clothing/head/headband/red cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/headpiece display_name = "surplus earpiece" path = /obj/item/clothing/head/headset cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/cap display_name = "surplus cap" path = /obj/item/clothing/head/tgmccap cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/booniehat display_name = "surplus boonie hat" path = /obj/item/clothing/head/boonie cost = 3 - slot = ITEM_SLOT_HEAD + slot = SLOT_HEAD /datum/gear/eyepatch display_name = "Eyepatch" path = /obj/item/clothing/glasses/eyepatch cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/glasses display_name = "Prescription Glasses" path = /obj/item/clothing/glasses/regular cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/shades display_name = "Big shades" path = /obj/item/clothing/glasses/sunglasses/fake/big cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/shades_prescription display_name = "Big shades (prescription)" path = /obj/item/clothing/glasses/sunglasses/fake/big/prescription cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/sunglasses display_name = "Sunglasses" path = /obj/item/clothing/glasses/sunglasses/fake cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/sunglasses_prescription display_name = "Sunglasses (prescription)" path = /obj/item/clothing/glasses/sunglasses/fake/prescription cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/cigar display_name = "Cigar" path = /obj/item/clothing/mask/cigarette/cigar cost = 2 - slot = ITEM_SLOT_MASK + slot = SLOT_WEAR_MASK /datum/gear/cigarette display_name = "Cigarette" path = /obj/item/clothing/mask/cigarette cost = 2 - slot = ITEM_SLOT_MASK + slot = SLOT_WEAR_MASK /datum/gear/cigarette/pipe display_name = "Smoking pipe" path = /obj/item/clothing/mask/cigarette/pipe cost = 3 - slot = ITEM_SLOT_MASK + slot = SLOT_WEAR_MASK /datum/gear/cigarette/pipe/corn display_name = "Corn cob pipe" path = /obj/item/clothing/mask/cigarette/pipe/cobpipe cost = 3 - slot = ITEM_SLOT_MASK + slot = SLOT_WEAR_MASK /datum/gear/cigarette/pipe/corn/curved display_name = "Curved corn cob pipe" path = /obj/item/clothing/mask/cigarette/pipe/cobpipe/curved cost = 3 - slot = ITEM_SLOT_MASK + slot = SLOT_WEAR_MASK /datum/gear/cigarette/pipe/bone display_name = "Europan bone pipe" path = /obj/item/clothing/mask/cigarette/pipe/bonepipe cost = 3 - slot = ITEM_SLOT_MASK + slot = SLOT_WEAR_MASK /datum/gear/bgoggles display_name = "Ballistic goggles" path = /obj/item/clothing/glasses/mgoggles cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/bgoggles_prescription display_name = "Ballistic goggles (prescription)" path = /obj/item/clothing/glasses/mgoggles/prescription cost = 2 - slot = ITEM_SLOT_EYES + slot = SLOT_GLASSES /datum/gear/kotahi display_name = "Kotahi deck" path = /obj/item/toy/deck/kotahi cost = 2 - slot = ITEM_SLOT_R_HAND + slot = SLOT_R_HAND /datum/gear/rosary display_name = "Rosary" path = /obj/item/rosary cost = 1 - slot = ITEM_SLOT_R_HAND + slot = SLOT_R_HAND /datum/gear/card/ace/hearts display_name = "Old Ace of Hearts card" path = /obj/item/toy/card/ace/hearts cost = 1 - slot = ITEM_SLOT_R_HAND + slot = SLOT_R_HAND /datum/gear/card/ace/spades display_name = "Old Ace of Spades card" path = /obj/item/toy/card/ace/spades cost = 1 - slot = ITEM_SLOT_R_HAND + slot = SLOT_R_HAND diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 3e93c1dbfae21..0df2eff1352e1 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -4,7 +4,7 @@ // You do not need to raise this if you are adding new values that have sane defaults. // Only raise this value when changing the meaning/format/name/layout of an existing value // where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 47 +#define SAVEFILE_VERSION_MAX 46 /datum/preferences/proc/savefile_needs_update(savefile/S) var/savefile_version @@ -56,12 +56,7 @@ toggles_sound |= SOUND_WEATHER WRITE_FILE(S["toggles_sound"], toggles_sound) to_chat(parent, span_userdanger("Due to a fix, preferences for weather sound have been reverted to default settings; these are now ON. Go into Preferences and set sound toggles to OFF if you wish to not hear these sounds.")) - if(current_version < 47) - quick_equip = VALID_EQUIP_SLOTS - slot_draw_order_pref = SLOT_DRAW_ORDER - WRITE_FILE(S["quick_equip"], quick_equip) - WRITE_FILE(S["slot_draw_order_pref"], slot_draw_order_pref) - to_chat(parent, span_userdanger("Due to a refactor of slots, slot preferences have been reverted to defaults.")) + //handles converting savefiles to new formats //MAKE SURE YOU KEEP THIS UP TO DATE! diff --git a/code/modules/client/preferences_ui.dm b/code/modules/client/preferences_ui.dm index ce8c47990e422..fd2fe349c3545 100644 --- a/code/modules/client/preferences_ui.dm +++ b/code/modules/client/preferences_ui.dm @@ -713,11 +713,11 @@ if("change_quick_equip") var/editing_slot = params["selection"] - var/slot = tgui_input_list(ui.user, "Which slot would you like to draw/equip from?", "Preferred Slot", SLOT_FLUFF_DRAW) + var/slot = tgui_input_list(usr, "Which slot would you like to draw/equip from?", "Preferred Slot", SLOT_FLUFF_DRAW) if(!slot) return quick_equip[editing_slot] = slot_fluff_to_flag(slot) - to_chat(ui.user, span_notice("You will now equip/draw from the [slot] slot first.")) + to_chat(src, span_notice("You will now equip/draw from the [slot] slot first.")) if("equip_slot_equip_position") var/returned_item_list_position = slot_draw_order_pref.Find(slot_fluff_to_flag(params["changing_item"])) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b53a6b1b5171b..0b8ecd3fe5c4c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -35,7 +35,7 @@ /obj/item/clothing/equipped(mob/user, slot) . = ..() - if(!(equip_slot_flags & slot)) + if(!(equip_slot_flags & slotdefine2slotbit(slot))) return if(!ishuman(user)) return @@ -47,7 +47,7 @@ /obj/item/clothing/unequipped(mob/unequipper, slot) - if(!(equip_slot_flags & slot)) + if(!(equip_slot_flags & slotdefine2slotbit(slot))) return ..() if(!ishuman(unequipper)) return ..() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 5adadd1c7f314..a14825585035a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -399,17 +399,17 @@ /obj/item/clothing/glasses/sunglasses/sechud/equipped(mob/living/carbon/human/user, slot) - if(slot & ITEM_SLOT_EYES) + if(slot == SLOT_GLASSES) var/datum/atom_hud/H = GLOB.huds[hud_type] H.add_hud_to(user) - return ..() + ..() /obj/item/clothing/glasses/sunglasses/sechud/dropped(mob/living/carbon/human/user) if(istype(user)) if(src == user.glasses) //dropped is called before the inventory reference is updated. var/datum/atom_hud/H = GLOB.huds[hud_type] H.remove_hud_from(user) - return ..() + ..() /obj/item/clothing/glasses/sunglasses/sechud/tactical diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 3fd107ebd3239..136c16c6d63a5 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -19,7 +19,7 @@ /obj/item/clothing/glasses/hud/equipped(mob/user, slot) if(!ishuman(user)) return ..() - if(slot & ITEM_SLOT_EYES) + if(slot == SLOT_GLASSES) if(active) activate_hud(user) else if(affected_user) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 70215fe2f6484..e5c5e0fcf3fba 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -26,7 +26,7 @@ return if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_GAS_BREATH)) return - if(slot & ITEM_SLOT_MASK) + if(slot != SLOT_WEAR_MASK) return for(var/M in get_hearers_in_view(hearing_range, src)) if(ismob(M)) diff --git a/code/modules/clothing/modular_armor/attachments.dm b/code/modules/clothing/modular_armor/attachments.dm index 3efbe551e933e..863171eeef5b1 100644 --- a/code/modules/clothing/modular_armor/attachments.dm +++ b/code/modules/clothing/modular_armor/attachments.dm @@ -50,7 +50,7 @@ ///Layer for the attachment to be applied to. var/attachment_layer ///Slot that is required for the action to appear to the equipper. If null the action will appear whenever the item is equiped to a slot. - var/prefered_slot = ITEM_SLOT_OCLOTHING + var/prefered_slot = SLOT_WEAR_SUIT ///List of slots this attachment has. var/list/attachments_by_slot = list() @@ -107,7 +107,7 @@ ///Adds or removes actions based on whether the parent is in the correct slot. /obj/item/armor_module/proc/handle_actions(datum/source, mob/user, slot) SIGNAL_HANDLER - if(prefered_slot && !(slot & prefered_slot) || !CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION)) + if(prefered_slot && (slot != prefered_slot) || !CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION)) LAZYREMOVE(actions_types, /datum/action/item_action/toggle) var/datum/action/item_action/toggle/old_action = locate(/datum/action/item_action/toggle) in actions old_action?.remove_action(user) diff --git a/code/modules/clothing/modular_armor/attachments/cape.dm b/code/modules/clothing/modular_armor/attachments/cape.dm index 42290ea77ebc2..3873df4ad4ef0 100644 --- a/code/modules/clothing/modular_armor/attachments/cape.dm +++ b/code/modules/clothing/modular_armor/attachments/cape.dm @@ -7,7 +7,7 @@ icon_state = "cape" slot = ATTACHMENT_SLOT_CAPE attachment_layer = CAPE_LAYER - prefered_slot = ITEM_SLOT_ICLOTHING + prefered_slot = SLOT_W_UNIFORM greyscale_config = /datum/greyscale_config/cape attach_features_flags = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_ACTIVATION|ATTACH_NO_HANDS attach_delay = 0 SECONDS diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 332b3a345973d..96b7e4da887c2 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -126,7 +126,7 @@ /obj/item/armor_module/module/tyr_extra_armor/on_attach(obj/item/attaching_to, mob/user) . = ..() - attaching_to.AddComponent(/datum/component/stun_mitigation, slot_override = ITEM_SLOT_OCLOTHING, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) + attaching_to.AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) /obj/item/armor_module/module/tyr_extra_armor/on_detach(obj/item/detaching_from, mob/user) detaching_from.remove_component(/datum/component/stun_mitigation) @@ -373,7 +373,7 @@ ///Handles starting the shield when the parent is equiped to the correct slot. /obj/item/armor_module/module/eshield/proc/handle_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - if(!(slot & ITEM_SLOT_OCLOTHING) || !isliving(equipper)) + if(slot != SLOT_WEAR_SUIT || !isliving(equipper)) return if(!recharge_timer) START_PROCESSING(SSobj, src) @@ -384,7 +384,7 @@ ///Handles removing the shield when the parent is unequipped /obj/item/armor_module/module/eshield/proc/handle_unequip(datum/source, mob/unequipper, slot) SIGNAL_HANDLER - if(slot != ITEM_SLOT_OCLOTHING || !isliving(unequipper)) + if(slot != SLOT_WEAR_SUIT || !isliving(unequipper)) return UnregisterSignal(unequipper, COMSIG_LIVING_SHIELDCALL) STOP_PROCESSING(SSobj, src) @@ -524,7 +524,7 @@ slot = ATTACHMENT_SLOT_HEAD_MODULE attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB active = FALSE - prefered_slot = ITEM_SLOT_HEAD + prefered_slot = SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "welding_head_xn", /obj/item/clothing/head/modular/tdf = "") ///Mod for extra eye protection when activated. @@ -575,7 +575,7 @@ slot = ATTACHMENT_SLOT_HEAD_MODULE attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB active = FALSE - prefered_slot = ITEM_SLOT_HEAD + prefered_slot = SLOT_HEAD variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "welding_head_superior_xn", /obj/item/clothing/head/modular/tdf = "") /obj/item/armor_module/module/welding/superior/on_attach(obj/item/attaching_to, mob/user) @@ -594,7 +594,7 @@ zoom_viewsize = 12 attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB slot = ATTACHMENT_SLOT_HEAD_MODULE - prefered_slot = ITEM_SLOT_HEAD + prefered_slot = SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE /obj/item/armor_module/module/binoculars/activate(mob/living/user) @@ -640,7 +640,7 @@ worn_icon_state = "artemis_head_a" slot = ATTACHMENT_SLOT_HEAD_MODULE attach_features_flags = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB - prefered_slot = ITEM_SLOT_HEAD + prefered_slot = SLOT_HEAD /obj/item/armor_module/module/artemis/on_attach(obj/item/attaching_to, mob/user) . = ..() @@ -658,7 +658,7 @@ worn_icon_state = "antenna_head_a" attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB slot = ATTACHMENT_SLOT_HEAD_MODULE - prefered_slot = ITEM_SLOT_HEAD + prefered_slot = SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE ///If the comms system is configured. var/comms_setup = FALSE @@ -666,7 +666,7 @@ var/startup_timer_id /obj/item/armor_module/module/antenna/handle_actions(datum/source, mob/user, slot) - if(!(slot & prefered_slot)) + if(slot != prefered_slot) UnregisterSignal(user, COMSIG_CAVE_INTERFERENCE_CHECK) comms_setup = COMMS_OFF if(startup_timer_id) @@ -719,7 +719,7 @@ icon_state = "night_vision" attach_features_flags = ATTACH_REMOVABLE|ATTACH_NO_HANDS slot = ATTACHMENT_SLOT_HEAD_MODULE - prefered_slot = ITEM_SLOT_HEAD + prefered_slot = SLOT_HEAD slowdown = 0.1 ///The goggles this module deploys var/obj/item/clothing/glasses/night_vision/mounted/attached_goggles @@ -779,7 +779,7 @@ ///Called when the parent is equipped; deploys the goggles /obj/item/armor_module/module/night_vision/proc/deploy(datum/source, mob/user, slot) SIGNAL_HANDLER - if(!ishuman(user) || !(prefered_slot & slot)) //Must be human for the following procs to work + if(!ishuman(user) || prefered_slot != slot) //Must be human for the following procs to work return var/mob/living/carbon/human/wearer = user @@ -788,7 +788,7 @@ to_chat(wearer, span_warning("Could not deploy night vision system due to [wearer.head]!")) return - INVOKE_ASYNC(wearer, TYPE_PROC_REF(/mob/living/carbon/human, equip_to_slot), attached_goggles, ITEM_SLOT_EYES) + INVOKE_ASYNC(wearer, TYPE_PROC_REF(/mob/living/carbon/human, equip_to_slot), attached_goggles, SLOT_GLASSES) ///Called when the parent is unequipped; undeploys the goggles /obj/item/armor_module/module/night_vision/proc/undeploy(datum/source, mob/user, slot) diff --git a/code/modules/clothing/modular_armor/modular.dm b/code/modules/clothing/modular_armor/modular.dm index 2a6fed73aeac9..dd91f7c91b21f 100644 --- a/code/modules/clothing/modular_armor/modular.dm +++ b/code/modules/clothing/modular_armor/modular.dm @@ -140,7 +140,7 @@ return standing /obj/item/clothing/suit/modular/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) - if(slot == ITEM_SLOT_OCLOTHING && ishuman(user)) + if(slot == SLOT_WEAR_SUIT && ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/clothing/under/undersuit = H.w_uniform if(!istype(undersuit, allowed_uniform_type)) @@ -168,7 +168,7 @@ return FALSE if(!ishuman(user)) return FALSE - if(slot != ITEM_SLOT_OCLOTHING) + if(slot != SLOT_WEAR_SUIT) return FALSE return TRUE //only give action button when armor is worn. diff --git a/code/modules/clothing/modular_armor/som.dm b/code/modules/clothing/modular_armor/som.dm index 5c5a520aae2a9..c0372e9a49519 100644 --- a/code/modules/clothing/modular_armor/som.dm +++ b/code/modules/clothing/modular_armor/som.dm @@ -55,12 +55,6 @@ /obj/item/armor_module/storage/general/som, ) -/obj/item/clothing/suit/modular/som/medstorage - starting_attachments = list( - /obj/item/armor_module/module/better_shoulder_lamp, - /obj/item/armor_module/storage/medical/som, - ) - /obj/item/clothing/suit/modular/som/shield starting_attachments = list( /obj/item/armor_module/module/eshield/som, @@ -144,12 +138,6 @@ /obj/item/armor_module/storage/medical/som, ) -/obj/item/clothing/suit/modular/som/heavy/pyro/genstorage - starting_attachments = list( - /obj/item/armor_module/module/fire_proof/som, - /obj/item/armor_module/storage/general/som, - ) - /obj/item/clothing/suit/modular/som/heavy/lorica starting_attachments = list( /obj/item/armor_module/module/tyr_extra_armor/som, diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 515c954c4a7fa..e907284f1375a 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -89,7 +89,7 @@ /obj/item/clothing/suit/storage/marine/item_action_slot_check(mob/user, slot) if(!ishuman(user)) return FALSE - if(!(slot & ITEM_SLOT_OCLOTHING)) + if(slot != SLOT_WEAR_SUIT) return FALSE return TRUE //only give action button when armor is worn. @@ -161,7 +161,7 @@ /obj/item/clothing/suit/storage/marine/specialist/Initialize(mapload, ...) . = ..() AddComponent(/datum/component/suit_autodoc) - AddComponent(/datum/component/stun_mitigation, slot_override = ITEM_SLOT_OCLOTHING, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) + AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) AddElement(/datum/element/limb_support) if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b18_in_use += src @@ -438,10 +438,8 @@ return TRUE /obj/item/clothing/suit/storage/faction/item_action_slot_check(mob/user, slot) - if(!ishuman(user)) - return FALSE - if(!(slot & ITEM_SLOT_OCLOTHING)) - return FALSE + if(!ishuman(user)) return FALSE + if(slot != SLOT_WEAR_SUIT) return FALSE return TRUE //only give action button when armor is worn. /obj/item/clothing/suit/storage/faction/UPP diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index e65b3893784bb..4f9d39da2238a 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -192,7 +192,7 @@ /obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/user, slot) - if(slot & ITEM_SLOT_OCLOTHING) + if(slot == SLOT_WEAR_SUIT) ENABLE_BITFIELD(user.restrained_flags, RESTRAINED_STRAIGHTJACKET) user.stop_pulling() //Can't pull if restrained. if(user.handcuffed) //Keep the cuffs on. diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index c80f7be52a01a..cd7488bbe4052 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -490,9 +490,6 @@ /obj/item/clothing/under/som/medic/vest starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) -/obj/item/clothing/under/som/medic/vest/black - starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) - /obj/item/clothing/under/som/veteran name = "\improper SOM veteran uniform" desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies. This one has markings indicating specialist status." @@ -629,9 +626,6 @@ /obj/item/clothing/under/vsd/upp/webbing starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) -/obj/item/clothing/under/vsd/upp/white_webbing - starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) - /obj/item/clothing/under/vsd/shirt name = "V.S.D shirt" icon_state = "vsd_shirt" diff --git a/code/modules/logging/log_category.dm b/code/modules/logging/log_category.dm index 7f048f9e65cbf..96849ff02c821 100644 --- a/code/modules/logging/log_category.dm +++ b/code/modules/logging/log_category.dm @@ -37,7 +37,7 @@ GENERAL_PROTECT_DATUM(/datum/log_category) category = LOG_CATEGORY_NOT_FOUND /// Add an entry to this category. It is very important that any data you provide doesn't hold references to anything! -/datum/log_category/proc/create_entry(message, list/data, list/semver_pocket) +/datum/log_category/proc/create_entry(message, list/data, list/semver_store) var/datum/log_entry/entry = new( // world state contains raw timestamp timestamp = logger.human_readable_timestamp(), @@ -45,7 +45,7 @@ GENERAL_PROTECT_DATUM(/datum/log_category) message = message, flags = entry_flags, data = data, - semver_pocket = semver_pocket, + semver_store = semver_store, ) write_entry(entry) diff --git a/code/modules/logging/log_entry.dm b/code/modules/logging/log_entry.dm index f5edf39502ff4..3de4e543d1a1f 100644 --- a/code/modules/logging/log_entry.dm +++ b/code/modules/logging/log_entry.dm @@ -2,7 +2,7 @@ // Schema version must always be the very last element in the array. // Current Schema: 1.0.0 -// [timestamp, category, message, data, world_state, semver_pocket, id, schema_version] +// [timestamp, category, message, data, world_state, semver_store, id, schema_version] /// A datum which contains log information. /datum/log_entry @@ -32,11 +32,11 @@ var/list/data /// Semver store of the log entry, used to store the schema of data entries - var/list/semver_pocket + var/list/semver_store GENERAL_PROTECT_DATUM(/datum/log_entry) -/datum/log_entry/New(timestamp, category, message, flags, list/data, list/semver_pocket) +/datum/log_entry/New(timestamp, category, message, flags, list/data, list/semver_store) ..() src.id = next_id++ @@ -45,7 +45,7 @@ GENERAL_PROTECT_DATUM(/datum/log_entry) src.flags = flags src.message = message with_data(data) - with_semver_pocket(semver_pocket) + with_semver_store(semver_store) /datum/log_entry/proc/with_data(list/data) if(!isnull(data)) @@ -56,13 +56,13 @@ GENERAL_PROTECT_DATUM(/datum/log_entry) src.data = data return src -/datum/log_entry/proc/with_semver_pocket(list/semver_pocket) - if(isnull(semver_pocket)) +/datum/log_entry/proc/with_semver_store(list/semver_store) + if(isnull(semver_store)) return - if(!islist(semver_pocket)) - stack_trace("Log entry semver store was not a list, it was [semver_pocket.type]. We cannot reliably convert it to a list.") + if(!islist(semver_store)) + stack_trace("Log entry semver store was not a list, it was [semver_store.type]. We cannot reliably convert it to a list.") else - src.semver_pocket = semver_pocket + src.semver_store = semver_store return src /// Converts the log entry to a human-readable string. @@ -88,7 +88,7 @@ GENERAL_PROTECT_DATUM(/datum/log_entry) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_MESSAGE, message) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_DATA, data) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_WORLD_STATE, world.get_world_state_for_logging()) - MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SEMVER_STORE, semver_pocket) + MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SEMVER_STORE, semver_store) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_ID, id) MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SCHEMA_VERSION, schema_version) return "{[json_entries.Join(",")]}" diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm index 0762124071076..6c9e24c755eb7 100644 --- a/code/modules/logging/log_holder.dm +++ b/code/modules/logging/log_holder.dm @@ -92,7 +92,7 @@ GENERAL_PROTECT_DATUM(/datum/log_holder) "message" = entry.message, "timestamp" = entry.timestamp, "data" = entry.data, - "semver" = entry.semver_pocket, + "semver" = entry.semver_store, )) category_data["entries"] = entries category_data["entry_count"] = category.entry_count @@ -293,11 +293,11 @@ GENERAL_PROTECT_DATUM(/datum/log_holder) Log(LOG_CATEGORY_NOT_FOUND, message, data) CRASH("Attempted to log to a category that doesn't exist! [category]") - var/list/semver_pocket = null + var/list/semver_store = null if(length(data)) - semver_pocket = list() - data = recursive_jsonify(data, semver_pocket) - log_category.create_entry(message, data, semver_pocket) + semver_store = list() + data = recursive_jsonify(data, semver_store) + log_category.create_entry(message, data, semver_store) /// Recursively converts an associative list of datums into their jsonified(list) form /datum/log_holder/proc/recursive_jsonify(list/data_list, list/semvers) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 97807225c026d..a6b082e3b567e 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -60,7 +60,7 @@ update_inv_l_hand() W.pixel_x = initial(W.pixel_x) W.pixel_y = initial(W.pixel_y) - W.equipped(src, ITEM_SLOT_L_HAND) + W.equipped(src,SLOT_L_HAND) return TRUE return FALSE @@ -88,7 +88,7 @@ update_inv_r_hand() W.pixel_x = initial(W.pixel_x) W.pixel_y = initial(W.pixel_y) - W.equipped(src, ITEM_SLOT_R_HAND) + W.equipped(src,SLOT_R_HAND) return TRUE return FALSE @@ -310,12 +310,12 @@ /mob/proc/doUnEquip(obj/item/I) if(I == r_hand) r_hand = null - I.unequipped(src, ITEM_SLOT_R_HAND) + I.unequipped(src, SLOT_R_HAND) update_inv_r_hand() return ITEM_UNEQUIP_DROPPED else if (I == l_hand) l_hand = null - I.unequipped(src, ITEM_SLOT_L_HAND) + I.unequipped(src, SLOT_L_HAND) update_inv_l_hand() return ITEM_UNEQUIP_DROPPED return ITEM_UNEQUIP_FAIL @@ -347,17 +347,17 @@ /mob/living/carbon/human/get_equipped_items(include_pockets = FALSE) var/list/items = ..() if(!include_pockets) - items -= list(l_pocket, r_pocket) + items -= list(l_store, r_store) return items ///Find the slot an item is equipped to and returns its slot define /mob/proc/get_equipped_slot(obj/equipped_item) if(equipped_item == l_hand) - . = ITEM_SLOT_L_HAND + . = SLOT_L_HAND else if(equipped_item == r_hand) - . = ITEM_SLOT_R_HAND + . = SLOT_R_HAND else if(equipped_item == wear_mask) - . = ITEM_SLOT_MASK + . = SLOT_WEAR_MASK /mob/living/proc/unequip_everything() var/list/items = list() @@ -432,6 +432,10 @@ /mob/proc/get_item_by_slot(slot_id) return +/// Returns the item in a given bit slot +/mob/proc/get_item_by_slot_bit(slot_bit) + return + //placeholder until tg inventory system /mob/proc/is_holding(obj/item/I) return ((I == l_hand) || (I == r_hand)) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index b64877ae6b843..421269cc22770 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -69,7 +69,7 @@ var/knock_out_reduction = 1 ///How much slowdown is innate to our species var/slowdown = 0 - ///Inventory slots the race can't equip stuff to. Robots cannot wear shoes, for example. + ///Inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example var/list/no_equip = list() //----Related to dying in some way @@ -453,20 +453,20 @@ * unless you know exactly what it does */ var/list/gear = list( - "i_clothing" = list("loc" = ui_iclothing, "slot" = ITEM_SLOT_ICLOTHING, "state" = "uniform", "toggle" = TRUE), - "o_clothing" = list("loc" = ui_oclothing, "slot" = ITEM_SLOT_OCLOTHING, "state" = "suit", "toggle" = TRUE), - "mask" = list("loc" = ui_mask, "slot" = ITEM_SLOT_MASK, "state" = "mask", "toggle" = TRUE), - "gloves" = list("loc" = ui_gloves, "slot" = ITEM_SLOT_GLOVES, "state" = "gloves", "toggle" = TRUE), - "eyes" = list("loc" = ui_glasses, "slot" = ITEM_SLOT_EYES, "state" = "glasses","toggle" = TRUE), - "wear_ear" = list("loc" = ui_wear_ear, "slot" = ITEM_SLOT_EARS, "state" = "ears", "toggle" = TRUE), - "head" = list("loc" = ui_head, "slot" = ITEM_SLOT_HEAD, "state" = "head", "toggle" = TRUE), - "shoes" = list("loc" = ui_shoes, "slot" = ITEM_SLOT_FEET, "state" = "shoes", "toggle" = TRUE), - "suit storage" = list("loc" = ui_sstore1, "slot" = ITEM_SLOT_SUITSTORE, "state" = "suit_storage"), - "back" = list("loc" = ui_back, "slot" = ITEM_SLOT_BACK, "state" = "back"), - "id" = list("loc" = ui_id, "slot" = ITEM_SLOT_ID, "state" = "id"), - "storage1" = list("loc" = ui_storage1, "slot" = ITEM_SLOT_L_POCKET, "state" = "pocket"), - "storage2" = list("loc" = ui_storage2, "slot" = ITEM_SLOT_R_POCKET, "state" = "pocket"), - "belt" = list("loc" = ui_belt, "slot" = ITEM_SLOT_BELT, "state" = "belt") + "i_clothing" = list("loc" = ui_iclothing, "slot" = SLOT_W_UNIFORM, "state" = "uniform", "toggle" = TRUE), + "o_clothing" = list("loc" = ui_oclothing, "slot" = SLOT_WEAR_SUIT, "state" = "suit", "toggle" = TRUE), + "mask" = list("loc" = ui_mask, "slot" = SLOT_WEAR_MASK, "state" = "mask", "toggle" = TRUE), + "gloves" = list("loc" = ui_gloves, "slot" = SLOT_GLOVES, "state" = "gloves", "toggle" = TRUE), + "eyes" = list("loc" = ui_glasses, "slot" = SLOT_GLASSES, "state" = "glasses","toggle" = TRUE), + "wear_ear" = list("loc" = ui_wear_ear, "slot" = SLOT_EARS, "state" = "ears", "toggle" = TRUE), + "head" = list("loc" = ui_head, "slot" = SLOT_HEAD, "state" = "head", "toggle" = TRUE), + "shoes" = list("loc" = ui_shoes, "slot" = SLOT_SHOES, "state" = "shoes", "toggle" = TRUE), + "suit storage" = list("loc" = ui_sstore1, "slot" = SLOT_S_STORE, "state" = "suit_storage"), + "back" = list("loc" = ui_back, "slot" = SLOT_BACK, "state" = "back"), + "id" = list("loc" = ui_id, "slot" = SLOT_WEAR_ID, "state" = "id"), + "storage1" = list("loc" = ui_storage1, "slot" = SLOT_L_STORE, "state" = "pocket"), + "storage2" = list("loc" = ui_storage2, "slot" = SLOT_R_STORE, "state" = "pocket"), + "belt" = list("loc" = ui_belt, "slot" = SLOT_BELT, "state" = "belt") ) /datum/hud_data/New() @@ -475,19 +475,28 @@ equip_slots |= gear[slot]["slot"] if(has_hands) - equip_slots |= ITEM_SLOT_L_HAND - equip_slots |= ITEM_SLOT_R_HAND - equip_slots |= ITEM_SLOT_HANDCUFF - if(ITEM_SLOT_HEAD in equip_slots) - equip_slots |= ITEM_SLOT_HEAD - if(ITEM_SLOT_BACK in equip_slots) - equip_slots |= ITEM_SLOT_BACK - if(ITEM_SLOT_BELT in equip_slots) - equip_slots |= ITEM_SLOT_BELT - if(ITEM_SLOT_SUITSTORE in equip_slots) - equip_slots |= ITEM_SLOT_SUITSTORE - if(ITEM_SLOT_FEET in equip_slots) - equip_slots |= ITEM_SLOT_FEET + equip_slots |= SLOT_L_HAND + equip_slots |= SLOT_R_HAND + equip_slots |= SLOT_HANDCUFFED + if(SLOT_HEAD in equip_slots) + equip_slots |= SLOT_IN_HEAD + if(SLOT_BACK in equip_slots) + equip_slots |= SLOT_IN_BACKPACK + equip_slots |= SLOT_IN_B_HOLSTER + if(SLOT_BELT in equip_slots) + equip_slots |= SLOT_IN_HOLSTER + equip_slots |= SLOT_IN_BELT + if(SLOT_WEAR_SUIT in equip_slots) + equip_slots |= SLOT_IN_S_HOLSTER + equip_slots |= SLOT_IN_SUIT + if(SLOT_SHOES in equip_slots) + equip_slots |= SLOT_IN_BOOT + if(SLOT_W_UNIFORM in equip_slots) + equip_slots |= SLOT_IN_STORAGE + equip_slots |= SLOT_IN_L_POUCH + equip_slots |= SLOT_IN_R_POUCH + equip_slots |= SLOT_ACCESSORY + equip_slots |= SLOT_IN_ACCESSORY ///damage override at the species level, called by /mob/living/proc/apply_damage /datum/species/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, sharp = FALSE, edge = FALSE, updating_health = FALSE, penetration, mob/living/carbon/human/victim, mob/attacker) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 98a4adf7bad81..1b423ab699ce4 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -38,7 +38,7 @@ return TRUE if(istype(wear_mask, /obj/item/clothing/mask/facehugger) && human_user != src) - human_user.stripPanelUnequip(wear_mask, src, ITEM_SLOT_MASK) + human_user.stripPanelUnequip(wear_mask, src, SLOT_WEAR_MASK) return TRUE if(health >= get_crit_threshold()) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 3723d4f267b99..774cf3c7c0471 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -67,7 +67,7 @@ //Equipment slots. These are all references to items. ///The item currently being worn in the suit slot (usually armor) - var/obj/item/clothing/suit/wear_suit + var/obj/item/wear_suit ///The item currently inside the suit storage slot (not inside the armor itself) var/obj/item/s_store ///The jumpsuit/uniform that's currently being worn. @@ -81,15 +81,15 @@ ///The glasses being worn. var/obj/item/clothing/glasses/glasses ///The item currently on the character's head. - var/obj/item/clothing/head/head + var/obj/item/head ///The headset/ear item being worn. var/obj/item/wear_ear ///The ID being worn. var/obj/item/card/id/wear_id ///The item currently in the right pocket - var/obj/item/r_pocket + var/obj/item/r_store ///The item currently in the left pocket - var/obj/item/l_pocket + var/obj/item/l_store ///The current standing icon var/icon/stand_icon diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 438d1398eb77a..bd69d865f03b1 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -5,11 +5,11 @@ return COMSIG_KB_ACTIVATED //The return value must be a flag compatible with the signals triggering this. /// runs equip, quick_equip_used is the # in INVOKE_ASYNC -/mob/living/carbon/human/proc/do_quick_equip(quick_equip_slot = NONE) +/mob/living/carbon/human/proc/do_quick_equip(quick_equip_slot = 0) if(incapacitated() || lying_angle) return - var/slot_requested = client?.prefs?.quick_equip[quick_equip_slot] || VALID_EQUIP_SLOTS[quick_equip_slot] + var/slot_requested = client?.prefs?.quick_equip[quick_equip_slot] || VALID_EQUIP_SLOTS var/obj/item/I = get_active_held_item() if(!I) //draw item if(next_move > world.time) @@ -25,28 +25,26 @@ if(draw_from_slot_if_possible(slot)) next_move = world.time + 1 return - return - if(s_active?.on_attackby(s_active, I, src)) //stored in currently open storage - return TRUE - if(equip_to_appropriate_slot(I, FALSE, FALSE)) //we try to put it in an appropriate slot first - return - if(slot_requested) - if(equip_to_slot_if_possible(I, slot_requested, FALSE, FALSE, FALSE)) // then we try to put it in the requested slot + else //store item + if(s_active?.on_attackby(s_active, I, src)) //stored in currently open storage + return TRUE + if(slot_requested) + if(equip_to_slot_if_possible(I, slot_requested, FALSE, FALSE, FALSE)) + return + if(!equip_to_appropriate_slot(I, FALSE)) return - if(equip_to_appropriate_slot(I, FALSE, TRUE)) // then we just go through draw_order storage - return - if(hand) - update_inv_l_hand() - else - update_inv_r_hand() + if(hand) + update_inv_l_hand(FALSE) + else + update_inv_r_hand(FALSE) /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) - for(var/slot in slots) - if(equip_to_slot_if_possible(W, slot, ignore_delay = TRUE, warning = FALSE)) + for (var/slot in slots) + if (equip_to_slot_if_possible(W, slot, ignore_delay = TRUE, warning = FALSE)) return slot - if(del_on_fail) + if (del_on_fail) qdel(W) return null @@ -57,52 +55,77 @@ if(E.body_part == org_name) return !(E.limb_status & LIMB_DESTROYED) -/// Does src have the appropriate limbs to equip to the provided slot? /mob/living/carbon/human/proc/has_limb_for_slot(slot) switch(slot) - if(ITEM_SLOT_BACK) + if(SLOT_BACK) return has_limb(CHEST) - if(ITEM_SLOT_MASK) + if(SLOT_WEAR_MASK) return has_limb(HEAD) - if(ITEM_SLOT_HANDCUFF) + if(SLOT_HANDCUFFED) return has_limb(HAND_LEFT) && has_limb(HAND_RIGHT) - if(ITEM_SLOT_L_HAND) + if(SLOT_L_HAND) return has_limb(HAND_LEFT) - if(ITEM_SLOT_R_HAND) + if(SLOT_R_HAND) return has_limb(HAND_RIGHT) - if(ITEM_SLOT_BELT) + if(SLOT_BELT) return has_limb(CHEST) - if(ITEM_SLOT_ID) + if(SLOT_WEAR_ID) return TRUE - if(ITEM_SLOT_EARS) + if(SLOT_EARS) return has_limb(HEAD) - if(ITEM_SLOT_EYES) + if(SLOT_GLASSES) return has_limb(HEAD) - if(ITEM_SLOT_GLOVES) + if(SLOT_GLOVES) return has_limb(HAND_LEFT) && has_limb(HAND_RIGHT) - if(ITEM_SLOT_HEAD) + if(SLOT_HEAD) return has_limb(HEAD) - if(ITEM_SLOT_FEET) + if(SLOT_SHOES) return has_limb(FOOT_RIGHT) && has_limb(FOOT_LEFT) - if(ITEM_SLOT_OCLOTHING) + if(SLOT_WEAR_SUIT) return has_limb(CHEST) - if(ITEM_SLOT_ICLOTHING) + if(SLOT_W_UNIFORM) return has_limb(CHEST) - if(ITEM_SLOT_L_POCKET) + if(SLOT_L_STORE) return has_limb(CHEST) - if(ITEM_SLOT_R_POCKET) + if(SLOT_R_STORE) return has_limb(CHEST) - if(ITEM_SLOT_SUITSTORE) + if(SLOT_S_STORE) + return has_limb(CHEST) + if(SLOT_ACCESSORY) + return has_limb(CHEST) + if(SLOT_IN_BOOT) + return has_limb(FOOT_RIGHT) && has_limb(FOOT_LEFT) + if(SLOT_IN_BACKPACK) + return has_limb(CHEST) + if(SLOT_IN_SUIT) + return has_limb(CHEST) + if(SLOT_IN_BELT) + return has_limb(CHEST) + if(SLOT_IN_HEAD) + return has_limb(HEAD) + if(SLOT_IN_ACCESSORY) + return has_limb(CHEST) + if(SLOT_IN_HOLSTER) + return has_limb(CHEST) + if(SLOT_IN_S_HOLSTER) + return has_limb(CHEST) + if(SLOT_IN_B_HOLSTER) + return has_limb(CHEST) + if(SLOT_IN_STORAGE) + return TRUE + if(SLOT_IN_L_POUCH) + return has_limb(CHEST) + if(SLOT_IN_R_POUCH) return has_limb(CHEST) /mob/living/carbon/human/put_in_l_hand(obj/item/W) - var/datum/limb/O = get_limb(BODY_ZONE_PRECISE_L_HAND) + var/datum/limb/O = get_limb("l_hand") if(!O?.is_usable()) return FALSE . = ..() /mob/living/carbon/human/put_in_r_hand(obj/item/W) - var/datum/limb/O = get_limb(BODY_ZONE_PRECISE_R_HAND) + var/datum/limb/O = get_limb("r_hand") if(!O?.is_usable()) return FALSE . = ..() @@ -118,7 +141,7 @@ wear_suit = null if(s_store) dropItemToGround(s_store) - I.unequipped(src, ITEM_SLOT_OCLOTHING) + I.unequipped(src, SLOT_WEAR_SUIT) if(I.inv_hide_flags & HIDESHOES) update_inv_shoes() if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) @@ -128,16 +151,16 @@ update_inv_wear_suit() . = ITEM_UNEQUIP_UNEQUIPPED else if(I == w_uniform) - if(r_pocket) - dropItemToGround(r_pocket) - if(l_pocket) - dropItemToGround(l_pocket) + if(r_store) + dropItemToGround(r_store) + if(l_store) + dropItemToGround(l_store) if(belt) dropItemToGround(belt) if(wear_suit && istype(wear_suit, /obj/item/clothing/suit)) dropItemToGround(wear_suit) w_uniform = null - I.unequipped(src, ITEM_SLOT_ICLOTHING) + I.unequipped(src, SLOT_W_UNIFORM) update_suit_sensors() update_inv_w_uniform() . = ITEM_UNEQUIP_UNEQUIPPED @@ -146,7 +169,7 @@ if(head.inv_hide_flags & HIDEFACE) updatename = 1 head = null - I.unequipped(src, ITEM_SLOT_HEAD) + I.unequipped(src, SLOT_HEAD) if(updatename) name = get_visible_name() if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR|HIDE_EXCESS_HAIR)) @@ -161,12 +184,12 @@ . = ITEM_UNEQUIP_UNEQUIPPED else if (I == gloves) gloves = null - I.unequipped(src, ITEM_SLOT_GLOVES) + I.unequipped(src, SLOT_GLOVES) update_inv_gloves() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == glasses) glasses = null - I.unequipped(src, ITEM_SLOT_EYES) + I.unequipped(src, SLOT_GLASSES) var/obj/item/clothing/glasses/G = I if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) update_sight() @@ -175,38 +198,38 @@ . = ITEM_UNEQUIP_UNEQUIPPED else if (I == wear_ear) wear_ear = null - I.unequipped(src, ITEM_SLOT_EARS) + I.unequipped(src, SLOT_EARS) update_inv_ears() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == shoes) shoes = null - I.unequipped(src, ITEM_SLOT_FEET) + I.unequipped(src, SLOT_SHOES) update_inv_shoes() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == belt) belt = null - I.unequipped(src, ITEM_SLOT_BELT) + I.unequipped(src, SLOT_BELT) update_inv_belt() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == wear_id) wear_id = null - I.unequipped(src, ITEM_SLOT_ID) + I.unequipped(src, SLOT_WEAR_ID) update_inv_wear_id() name = get_visible_name() . = ITEM_UNEQUIP_UNEQUIPPED - else if (I == r_pocket) - r_pocket = null - I.unequipped(src, ITEM_SLOT_R_POCKET) + else if (I == r_store) + r_store = null + I.unequipped(src, SLOT_R_STORE) update_inv_pockets() . = ITEM_UNEQUIP_UNEQUIPPED - else if (I == l_pocket) - l_pocket = null - I.unequipped(src, ITEM_SLOT_L_POCKET) + else if (I == l_store) + l_store = null + I.unequipped(src, SLOT_L_STORE) update_inv_pockets() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == s_store) s_store = null - I.unequipped(src, ITEM_SLOT_SUITSTORE) + I.unequipped(src, SLOT_S_STORE) update_inv_s_store() . = ITEM_UNEQUIP_UNEQUIPPED @@ -223,7 +246,8 @@ //This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() -/mob/living/carbon/human/equip_to_slot(obj/item/item_to_equip, slot, into_storage) +//set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc. +/mob/living/carbon/human/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) . = ..() if(bitslot) var/oldslot = slot @@ -231,104 +255,52 @@ if(!has_limb_for_slot(slot)) return - if(into_storage) - var/obj/item/selected_storage_target - switch(slot) - if(ITEM_SLOT_BACK) - selected_storage_target = back - if(ITEM_SLOT_SUITSTORE) - selected_storage_target = s_store - if(ITEM_SLOT_BELT) - selected_storage_target = belt - if(ITEM_SLOT_ACTIVE_STORAGE) - selected_storage_target = s_active - if(ITEM_SLOT_L_POCKET) - selected_storage_target = l_pocket - if(ITEM_SLOT_R_POCKET) - selected_storage_target = r_pocket - if(ITEM_SLOT_ICLOTHING) - if(isclothing(w_uniform)) - for(var/key AS in w_uniform.attachments_by_slot) - var/atom/attachment = w_uniform.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - selected_storage_target = attachment - break - if(ITEM_SLOT_OCLOTHING) - if(isclothing(wear_suit)) - for(var/key AS in wear_suit.attachments_by_slot) - var/atom/attachment = wear_suit.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - selected_storage_target = attachment - break - if(ITEM_SLOT_HEAD) - if(isclothing(head)) - for(var/key AS in head.attachments_by_slot) - var/atom/attachment = head.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - selected_storage_target = attachment - break - if(ITEM_SLOT_FEET) - if(isclothing(shoes)) - for(var/key AS in shoes.attachments_by_slot) - var/atom/attachment = shoes.attachments_by_slot[key] - if(!attachment?.storage_datum) - continue - selected_storage_target = attachment - break - - var/datum/storage/selected_storage = selected_storage_target.storage_datum - if(!isdatumstorage(selected_storage)) //probably means can_equip failed its job - to_chat(src, span_warning("Equipping to slot failed, yell at coders.")) - CRASH("Failed to get a valid storage datum from slot [slot] while equipping into container in equip_to_slot!") - return selected_storage.handle_item_insertion(item_to_equip, FALSE, src) + var/obj/item/selected_slot //the item in the specific slot we're trying to insert into, if applicable switch(slot) - if(ITEM_SLOT_BACK) + if(SLOT_BACK) back = item_to_equip item_to_equip.equipped(src, slot) update_inv_back() - if(ITEM_SLOT_MASK) + if(SLOT_WEAR_MASK) wear_mask = item_to_equip item_to_equip.equipped(src, slot) wear_mask_update(item_to_equip, TRUE) - if(ITEM_SLOT_HANDCUFF) + if(SLOT_HANDCUFFED) update_handcuffed(item_to_equip) - if(ITEM_SLOT_L_HAND) + if(SLOT_L_HAND) l_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_l_hand() - if(ITEM_SLOT_R_HAND) + if(SLOT_R_HAND) r_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_r_hand() - if(ITEM_SLOT_BELT) + if(SLOT_BELT) belt = item_to_equip item_to_equip.equipped(src, slot) update_inv_belt() - if(ITEM_SLOT_ID) + if(SLOT_WEAR_ID) wear_id = item_to_equip item_to_equip.equipped(src, slot) update_inv_wear_id() name = get_visible_name() - if(ITEM_SLOT_EARS) + if(SLOT_EARS) wear_ear = item_to_equip item_to_equip.equipped(src, slot) update_inv_ears() - if(ITEM_SLOT_EYES) + if(SLOT_GLASSES) glasses = item_to_equip item_to_equip.equipped(src, slot) var/obj/item/clothing/glasses/G = item_to_equip if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) update_sight() update_inv_glasses() - if(ITEM_SLOT_GLOVES) + if(SLOT_GLOVES) gloves = item_to_equip item_to_equip.equipped(src, slot) update_inv_gloves() - if(ITEM_SLOT_HEAD) + if(SLOT_HEAD) head = item_to_equip if(head.inv_hide_flags & HIDEFACE) name = get_visible_name() @@ -342,39 +314,144 @@ update_inv_glasses() item_to_equip.equipped(src, slot) update_inv_head() - if(ITEM_SLOT_FEET) + if(SLOT_SHOES) shoes = item_to_equip item_to_equip.equipped(src, slot) update_inv_shoes() - if(ITEM_SLOT_OCLOTHING) + if(SLOT_WEAR_SUIT) wear_suit = item_to_equip if(wear_suit.inv_hide_flags & HIDESHOES) update_inv_shoes() if(wear_suit.inv_hide_flags & HIDEJUMPSUIT) update_inv_w_uniform() - if(wear_suit.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR)) + if( wear_suit.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) update_hair() item_to_equip.equipped(src, slot) update_inv_wear_suit() - if(ITEM_SLOT_ICLOTHING) + if(SLOT_W_UNIFORM) w_uniform = item_to_equip item_to_equip.equipped(src, slot) update_inv_w_uniform() - if(ITEM_SLOT_L_POCKET) - l_pocket = item_to_equip + if(SLOT_L_STORE) + l_store = item_to_equip item_to_equip.equipped(src, slot) update_inv_pockets() - if(ITEM_SLOT_R_POCKET) - r_pocket = item_to_equip + if(SLOT_R_STORE) + r_store = item_to_equip item_to_equip.equipped(src, slot) update_inv_pockets() - if(ITEM_SLOT_SUITSTORE) + if(SLOT_S_STORE) s_store = item_to_equip item_to_equip.equipped(src, slot) update_inv_s_store() + if(SLOT_IN_BOOT) + selected_slot = shoes + if(SLOT_IN_BACKPACK) + selected_slot = back + if(SLOT_IN_SUIT) + selected_slot = wear_suit + if(SLOT_IN_BELT) + selected_slot = belt + if(SLOT_IN_HEAD) + selected_slot = head + if(SLOT_IN_HOLSTER) + selected_slot = belt + if(SLOT_IN_B_HOLSTER) + selected_slot = back + if(SLOT_IN_S_HOLSTER) + selected_slot = s_store + if(SLOT_IN_STORAGE) + selected_slot = s_active + if(SLOT_IN_L_POUCH) + selected_slot = l_store + if(SLOT_IN_R_POUCH) + selected_slot = r_store + if(SLOT_IN_ACCESSORY) + selected_slot = w_uniform + else + CRASH("[src] tried to equip [item_to_equip] to [slot] in equip_to_slot().") + + if(!selected_slot) + return FALSE + + var/datum/storage/selected_storage + if(isdatumstorage(selected_slot)) + selected_storage = selected_slot + else if(selected_slot.storage_datum) + selected_storage = selected_slot.storage_datum + else if(isclothing(selected_slot)) + var/obj/item/clothing/selected_clothing = selected_slot + for(var/key AS in selected_clothing.attachments_by_slot) + var/atom/attachment = selected_clothing.attachments_by_slot[key] + if(!attachment?.storage_datum) + continue + selected_storage = attachment.storage_datum + break + + if(!selected_storage) + return FALSE + + return selected_storage.handle_item_insertion(item_to_equip, FALSE, src) /mob/living/carbon/human/get_item_by_slot(slot_id) switch(slot_id) + if(SLOT_BACK) + return back + if(SLOT_WEAR_MASK) + return wear_mask + if(SLOT_BELT) + return belt + if(SLOT_WEAR_ID) + return wear_id + if(SLOT_EARS) + return wear_ear + if(SLOT_GLASSES) + return glasses + if(SLOT_GLOVES) + return gloves + if(SLOT_L_HAND) + return l_hand + if(SLOT_R_HAND) + return r_hand + if(SLOT_HEAD) + return head + if(SLOT_SHOES) + return shoes + if(SLOT_WEAR_SUIT) + return wear_suit + if(SLOT_W_UNIFORM) + return w_uniform + if(SLOT_L_STORE) + return l_store + if(SLOT_R_STORE) + return r_store + if(SLOT_S_STORE) + return s_store + if(SLOT_HANDCUFFED) + return handcuffed + if(SLOT_IN_BOOT) + return shoes + if(SLOT_IN_B_HOLSTER) + return back + if(SLOT_IN_BELT) + return belt + if(SLOT_IN_HOLSTER) + return belt + if(SLOT_IN_STORAGE) + return wear_suit + if(SLOT_IN_S_HOLSTER) + return s_store + if(SLOT_IN_ACCESSORY) + return w_uniform + if(SLOT_IN_L_POUCH) + return l_store + if(SLOT_IN_R_POUCH) + return r_store + if(SLOT_IN_HEAD) + return head + +/mob/living/carbon/human/get_item_by_slot_bit(slot_bit) + switch(slot_bit) if(ITEM_SLOT_OCLOTHING) return wear_suit if(ITEM_SLOT_ICLOTHING) @@ -398,9 +475,9 @@ if(ITEM_SLOT_BACK) return back if(ITEM_SLOT_R_POCKET) - return r_pocket + return r_store if(ITEM_SLOT_L_POCKET) - return l_pocket + return l_store if(ITEM_SLOT_SUITSTORE) return s_store if(ITEM_SLOT_HANDCUFF) @@ -415,31 +492,31 @@ return if(equipped_item == wear_suit) - . = ITEM_SLOT_OCLOTHING + . = SLOT_WEAR_SUIT else if(equipped_item == w_uniform) - . = ITEM_SLOT_ICLOTHING + . = SLOT_W_UNIFORM else if(equipped_item == shoes) - . = ITEM_SLOT_FEET + . = SLOT_SHOES else if(equipped_item == belt) - . = ITEM_SLOT_BELT + . = SLOT_BELT else if(equipped_item == gloves) - . = ITEM_SLOT_GLOVES + . = SLOT_GLOVES else if(equipped_item == glasses) - . = ITEM_SLOT_EYES + . = SLOT_GLASSES else if(equipped_item == head) - . = ITEM_SLOT_HEAD + . = SLOT_HEAD else if(equipped_item == wear_ear) - . = ITEM_SLOT_EARS + . = SLOT_EARS else if(equipped_item == wear_id) - . = ITEM_SLOT_ID - else if(equipped_item == r_pocket) - . = ITEM_SLOT_R_POCKET - else if(equipped_item == l_pocket) - . = ITEM_SLOT_L_POCKET + . = SLOT_WEAR_ID + else if(equipped_item == r_store) + . = SLOT_R_STORE + else if(equipped_item == l_store) + . = SLOT_L_STORE else if(equipped_item == s_store) - . = ITEM_SLOT_SUITSTORE + . = SLOT_S_STORE -/mob/living/carbon/human/stripPanelUnequip(obj/item/I, mob/M, slot_to_process) //todo deal with this +/mob/living/carbon/human/stripPanelUnequip(obj/item/I, mob/M, slot_to_process) if(!I.canStrip(M)) return log_combat(src, M, "attempted to remove [key_name(I)] ([slot_to_process])") @@ -479,8 +556,8 @@ * item_searched the item you want to check */ /mob/living/carbon/human/proc/is_item_in_slots(item_searched) - for(var/slot in SLOT_ALL) - if(get_item_by_slot(slot) == item_searched) + for (var/slot in SLOT_ALL) + if (get_item_by_slot(slot) == item_searched) return TRUE return FALSE @@ -489,8 +566,8 @@ * type searched the type you are looking for */ /mob/living/carbon/human/proc/get_type_in_slots(type_searched) - for(var/slot in SLOT_ALL) - if(istype(get_item_by_slot(slot),type_searched)) + for (var/slot in SLOT_ALL) + if (istype(get_item_by_slot(slot),type_searched)) return get_item_by_slot(slot) @@ -499,8 +576,8 @@ * item_searched the item you want to check */ /mob/living/carbon/human/proc/is_item_in_hands(obj/item/item_searched) - if(get_item_by_slot(ITEM_SLOT_R_HAND) == item_searched) + if (get_item_by_slot(SLOT_R_HAND) == item_searched) return TRUE - if(get_item_by_slot(ITEM_SLOT_L_HAND) == item_searched) + if (get_item_by_slot(SLOT_L_HAND) == item_searched) return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/combat_robots.dm b/code/modules/mob/living/carbon/human/species_types/combat_robots.dm index 48a36e66f3599..c7b9e9e8a396c 100644 --- a/code/modules/mob/living/carbon/human/species_types/combat_robots.dm +++ b/code/modules/mob/living/carbon/human/species_types/combat_robots.dm @@ -27,13 +27,13 @@ species_flags = NO_BREATHE|NO_BLOOD|NO_POISON|NO_PAIN|NO_CHEM_METABOLIZATION|NO_STAMINA|DETACHABLE_HEAD|HAS_NO_HAIR|ROBOTIC_LIMBS|IS_INSULATED no_equip = list( - ITEM_SLOT_ICLOTHING, - ITEM_SLOT_HEAD, - ITEM_SLOT_MASK, - ITEM_SLOT_OCLOTHING, - ITEM_SLOT_FEET, - ITEM_SLOT_GLOVES, - ITEM_SLOT_EYES, + SLOT_W_UNIFORM, + SLOT_HEAD, + SLOT_WEAR_MASK, + SLOT_WEAR_SUIT, + SLOT_SHOES, + SLOT_GLOVES, + SLOT_GLASSES, ) blood_color = "#2d2055" //an oil-like color - a little note, robots cannot shed blood in any way, due to their flags hair_color = "#00000000" diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 284ead170c32a..f9431e970432c 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -41,8 +41,8 @@ var/obj/item/card/id/id = H.wear_id id.access = list() // A bit gamey, but let's say ids have a security against zombies id.iff_signal = NONE - H.equip_to_slot_or_del(new claw_type, ITEM_SLOT_R_HAND) - H.equip_to_slot_or_del(new claw_type, ITEM_SLOT_L_HAND) + H.equip_to_slot_or_del(new claw_type, SLOT_R_HAND) + H.equip_to_slot_or_del(new claw_type, SLOT_L_HAND) var/datum/atom_hud/health_hud = GLOB.huds[DATA_HUD_MEDICAL_OBSERVER] health_hud.add_hud_to(H) H.job = new /datum/job/zombie //Prevent from skewing the respawn timer if you take a zombie, it's a ghost role after all @@ -69,9 +69,9 @@ if(limb.limb_status & LIMB_DESTROYED && !(limb.parent?.limb_status & LIMB_DESTROYED) && prob(10)) limb.remove_limb_flags(LIMB_DESTROYED) if(istype(limb, /datum/limb/hand/l_hand)) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, ITEM_SLOT_L_HAND) + H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_L_HAND) else if (istype(limb, /datum/limb/hand/r_hand)) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, ITEM_SLOT_R_HAND) + H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_R_HAND) H.update_body() else if(limb.limb_status & LIMB_BROKEN && prob(20)) limb.remove_limb_flags(LIMB_BROKEN | LIMB_SPLINTED | LIMB_STABILIZED) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 073df9c74fe38..bdbb36e524fee 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -727,14 +727,14 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) apply_overlay(SUIT_LAYER) /mob/living/carbon/human/update_inv_pockets() - if(l_pocket) + if(l_store) if(client && hud_used?.hud_shown) - l_pocket.screen_loc = ui_storage1 - client.screen += l_pocket - if(r_pocket) + l_store.screen_loc = ui_storage1 + client.screen += l_store + if(r_store) if(client && hud_used?.hud_shown) - r_pocket.screen_loc = ui_storage2 - client.screen += r_pocket + r_store.screen_loc = ui_storage2 + client.screen += r_store /mob/living/carbon/human/update_inv_wear_mask() diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 322e95b68ef10..a42c55fda3542 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -4,53 +4,26 @@ return if(I == back) back = null - I.unequipped(src, ITEM_SLOT_BACK) + I.unequipped(src, SLOT_BACK) update_inv_back() . = ITEM_UNEQUIP_UNEQUIPPED else if (I == wear_mask) wear_mask = null - I.unequipped(src, ITEM_SLOT_MASK) + I.unequipped(src, SLOT_WEAR_MASK) wear_mask_update(I) . = ITEM_UNEQUIP_UNEQUIPPED else if(I == handcuffed) update_handcuffed(null) . = ITEM_UNEQUIP_UNEQUIPPED -/mob/living/carbon/equip_to_slot(obj/item/item_to_equip, slot, into_storage) - . = ..() - - if(!slot) - return - - if(!istype(item_to_equip)) - return - - if(item_to_equip == l_hand) - l_hand = null - item_to_equip.unequipped(src, ITEM_SLOT_L_HAND) - update_inv_l_hand() - - else if(item_to_equip == r_hand) - r_hand = null - item_to_equip.unequipped(src, ITEM_SLOT_R_HAND) - update_inv_r_hand() - - for(var/datum/action/A AS in item_to_equip.actions) - A.remove_action(src) - - item_to_equip.screen_loc = null - item_to_equip.layer = ABOVE_HUD_LAYER - item_to_equip.plane = ABOVE_HUD_PLANE - item_to_equip.forceMove(src) - /mob/living/carbon/get_equipped_slot(obj/equipped_item) if(..()) return if(equipped_item == handcuffed) - . = ITEM_SLOT_HANDCUFF + . = SLOT_HANDCUFFED else if(equipped_item == back) - . = ITEM_SLOT_BACK + . = SLOT_BACK ///called when we get cuffed/uncuffed /mob/living/carbon/proc/update_handcuffed(obj/item/restraints/handcuffs/restraints) @@ -58,11 +31,11 @@ drop_all_held_items() stop_pulling() handcuffed = restraints - restraints.equipped(src, ITEM_SLOT_HANDCUFF) + restraints.equipped(src, SLOT_HANDCUFFED) handcuffed.RegisterSignal(src, COMSIG_LIVING_DO_RESIST, TYPE_PROC_REF(/atom/movable, resisted_against)) else if(handcuffed) handcuffed.UnregisterSignal(src, COMSIG_LIVING_DO_RESIST) - handcuffed.unequipped(src, ITEM_SLOT_HANDCUFF) + handcuffed.unequipped(src, SLOT_HANDCUFFED) handcuffed = null update_inv_handcuffed() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm index 5fd69c0da4030..50458752dfb0f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm @@ -291,9 +291,9 @@ var/mutable_appearance/stolen_appearance ///A list of slot to check for items, in order of priority var/static/list/slots_to_steal_from = list( - ITEM_SLOT_SUITSTORE, - ITEM_SLOT_BACK, - ITEM_SLOT_FEET, + SLOT_S_STORE, + SLOT_BACK, + SLOT_SHOES, ) /datum/action/ability/activable/xeno/snatch/action_activate() diff --git a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm index 1fd1456c198fb..5db322f2ef877 100644 --- a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm @@ -549,12 +549,12 @@ hugged.visible_message(span_danger("[src] smashes against [hugged]'s [blocked]!")) return FALSE - hugged.equip_to_slot(src, ITEM_SLOT_MASK) + hugged.equip_to_slot(src, SLOT_WEAR_MASK) return TRUE /obj/item/clothing/mask/facehugger/equipped(mob/living/user, slot) . = ..() - if(!(slot & ITEM_SLOT_MASK) || stat == DEAD) + if(slot != SLOT_WEAR_MASK || stat == DEAD) reset_attach_status(FALSE) return if(ishuman(user)) diff --git a/code/modules/mob/living/carbon/xenomorph/saddles.dm b/code/modules/mob/living/carbon/xenomorph/saddles.dm index 4b47b464a5a88..58d1a475f0fe0 100644 --- a/code/modules/mob/living/carbon/xenomorph/saddles.dm +++ b/code/modules/mob/living/carbon/xenomorph/saddles.dm @@ -40,8 +40,8 @@ /obj/item/storage/backpack/marine/duffelbag/xenosaddle/mob_can_equip(mob/user, slot, warning, override_nodrop, bitslot) if(!slot || !user) return FALSE - if(HAS_TRAIT(src, TRAIT_NODROP) && !(slot & ITEM_SLOT_HANDS) && !override_nodrop) //No drops can only be equipped to a hand slot - if(slot & ITEM_SLOT_HANDS) + if(HAS_TRAIT(src, TRAIT_NODROP) && slot != SLOT_L_HAND && slot != SLOT_R_HAND && !override_nodrop) //No drops can only be equipped to a hand slot + if(slot == SLOT_L_HAND || slot == SLOT_R_HAND) to_chat(user, span_notice("[src] is stuck to your hand!")) return FALSE if(isxenorunner(user)) @@ -64,7 +64,7 @@ if(!do_after(user, 3 SECONDS, NONE, target)) return user.temporarilyRemoveItemFromInventory(src) - rouny.equip_to_slot_if_possible(src, ITEM_SLOT_BACK,TRUE) + rouny.equip_to_slot_if_possible(src,SLOT_BACK,TRUE) /obj/item/storage/backpack/marine/duffelbag/xenosaddle/equipped(mob/equipper, slot) . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm index 89db07082a54a..93250a312c74f 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm @@ -514,25 +514,25 @@ Returns TRUE when loc_weeds_type changes. Returns FALSE when it doesn’t change AddComponent(/datum/component/jump, _jump_duration = duration, _jump_cooldown = cooldown, _stamina_cost = 0, _jump_height = height, _jump_sound = sound, _jump_flags = flags, _jumper_allow_pass_flags = jump_pass_flags) -/mob/living/carbon/xenomorph/equip_to_slot(obj/item/item_to_equip, slot, into_storage) +/mob/living/carbon/xenomorph/equip_to_slot(obj/item/item_to_equip, slot, bitslot) . = ..() if(bitslot) var/oldslot = slot slot = slotbit2slotdefine(oldslot) switch(slot) - if(ITEM_SLOT_BACK) + if(SLOT_BACK) back = item_to_equip item_to_equip.equipped(src, slot) update_inv_back() - if(ITEM_SLOT_L_HAND) + if(SLOT_L_HAND) l_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_l_hand() - if(ITEM_SLOT_R_HAND) + if(SLOT_R_HAND) r_hand = item_to_equip item_to_equip.equipped(src, slot) update_inv_r_hand() - if(ITEM_SLOT_MASK) + if(SLOT_WEAR_MASK) wear_mask = item_to_equip item_to_equip.equipped(src, slot) wear_mask_update(item_to_equip, TRUE) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index be9d6e11f8eff..5388d7c5a9018 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -206,33 +206,23 @@ equip_to_slot_if_possible(W, slot, FALSE) // equiphere -/** - * Attempts to put an item in either hand - * - * Arguments: - * * W - item trying to be put into either hand - * * del_on_fail - do we delete the item if we fail to put it into either hand? - * * warning - do we warn the user about the failure? - */ -/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = FALSE, warning = FALSE) - if(equip_to_slot_if_possible(W, ITEM_SLOT_R_HAND, TRUE, del_on_fail, warning, FALSE, FALSE)) +///Attempts to put an item in either hand +/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = FALSE, warning = FALSE, redraw_mob = TRUE) + if(equip_to_slot_if_possible(W, SLOT_L_HAND, TRUE, del_on_fail, warning, redraw_mob)) return TRUE - if(equip_to_slot_if_possible(W, ITEM_SLOT_L_HAND, TRUE, del_on_fail, warning, FALSE, FALSE)) + else if(equip_to_slot_if_possible(W, SLOT_R_HAND, TRUE, del_on_fail, warning, redraw_mob)) return TRUE return FALSE /** * This is a SAFE proc. Use this instead of equip_to_slot()! * set del_on_fail to have it delete item_to_equip if it fails to equip + * unset redraw_mob to prevent the mob from being redrawn at the end. */ -/mob/proc/equip_to_slot_if_possible(obj/item/item_to_equip, slot, ignore_delay = TRUE, del_on_fail = FALSE, warning = TRUE, override_nodrop = FALSE, into_storage) +/mob/proc/equip_to_slot_if_possible(obj/item/item_to_equip, slot, ignore_delay = TRUE, del_on_fail = FALSE, warning = TRUE, redraw_mob = TRUE, override_nodrop = FALSE) if(!istype(item_to_equip) || QDELETED(item_to_equip)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks return FALSE - if(isnull(into_storage)) //if a specific into_storage value isn't provided we try to look for storage in the slot - into_storage = FALSE - if(!!get_item_by_slot(slot)) - into_storage = TRUE - if(!item_to_equip.mob_can_equip(src, slot, warning, override_nodrop, into_storage)) + if(!item_to_equip.mob_can_equip(src, slot, warning, override_nodrop)) if(del_on_fail) qdel(item_to_equip) return FALSE @@ -251,36 +241,53 @@ item_to_equip.unwield(src) return TRUE - equip_to_slot(item_to_equip, slot, into_storage) //This proc should not ever fail. - //This will unwield items -without- triggering lights. - if(CHECK_BITFIELD(item_to_equip.item_flags, TWOHANDED)) - item_to_equip.unwield(src) - return TRUE - /** *This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on whether you can or can't eqip need to be done before! Use mob_can_equip() for that task. *In most cases you will want to use equip_to_slot_if_possible() */ -/mob/proc/equip_to_slot(obj/item/item_to_equip, slot, into_storage) - SHOULD_CALL_PARENT(TRUE) - return +/mob/proc/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE) + if(!slot) + return + if(!istype(item_to_equip)) + return + if(bitslot) + var/oldslot = slot + slot = slotbit2slotdefine(oldslot) + + if(item_to_equip == l_hand) + l_hand = null + item_to_equip.unequipped(src, SLOT_L_HAND) + update_inv_l_hand() + + else if(item_to_equip == r_hand) + r_hand = null + item_to_equip.unequipped(src, SLOT_R_HAND) + update_inv_r_hand() + + for(var/datum/action/A AS in item_to_equip.actions) + A.remove_action(src) + + item_to_equip.screen_loc = null + item_to_equip.layer = ABOVE_HUD_LAYER + item_to_equip.plane = ABOVE_HUD_PLANE + item_to_equip.forceMove(src) ///This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds starts and when events happen and such. -/mob/proc/equip_to_slot_or_del(obj/item/W, slot, override_nodrop = FALSE, into_storage) - return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, override_nodrop, into_storage) +/mob/proc/equip_to_slot_or_del(obj/item/W, slot, override_nodrop = FALSE) + return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, FALSE, override_nodrop) /// Tries to equip an item to the slot provided, otherwise tries to put it in hands, if hands are full the item is deleted /mob/proc/equip_to_slot_or_hand(obj/item/W, slot, override_nodrop = FALSE) if(!equip_to_slot_if_possible(W, slot, TRUE, FALSE, FALSE, FALSE, override_nodrop)) put_in_any_hand_if_possible(W, TRUE, FALSE) -///Attempts to store an item in a valid location based on SLOT_DRAW_ORDER -/mob/proc/equip_to_appropriate_slot(obj/item/W, ignore_delay = TRUE, into_storage) +///Attempts to store an item in a valid location based on SLOT_EQUIP_ORDER +/mob/proc/equip_to_appropriate_slot(obj/item/W, ignore_delay = TRUE) if(!istype(W)) return FALSE - for(var/slot in client?.prefs?.slot_draw_order_pref || SLOT_DRAW_ORDER) - if(equip_to_slot_if_possible(W, slot, ignore_delay, FALSE, FALSE, FALSE, into_storage)) + for(var/slot in SLOT_EQUIP_ORDER) + if(equip_to_slot_if_possible(W, slot, ignore_delay, FALSE, FALSE, FALSE)) return TRUE return FALSE @@ -295,6 +302,22 @@ if(!I) return FALSE + //This is quite horrible, there's probably a better way to do it. + //Each actual inventory slot has more than one slot define associated with it. + //The defines below are for specific items in specific slots, which allows for a much more specific draw order, i.e. drawing a weapon from a slot which would otherwise be lower in the order + if(slot == SLOT_IN_HOLSTER && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon)))) + return FALSE + if(slot == SLOT_IN_S_HOLSTER && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/belt/knifepouch)))) + return FALSE + if(slot == SLOT_IN_B_HOLSTER && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon)))) + return FALSE + if(slot == SLOT_IN_ACCESSORY && (!istype(I, /obj/item/clothing/under))) + return FALSE + if(slot == SLOT_IN_L_POUCH && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/pouch/pistol)))) + return FALSE + if(slot == SLOT_IN_R_POUCH && (!(istype(I, /obj/item/storage/holster) || istype(I, /obj/item/weapon) || istype(I, /obj/item/storage/pouch/pistol)))) + return FALSE + //Sends quick equip signal, if our signal is not handled/blocked we continue to the normal behaviour var/return_value = SEND_SIGNAL(I, COMSIG_ITEM_QUICK_EQUIP, src) switch(return_value) diff --git a/code/modules/projectiles/gun_attachables/rail.dm b/code/modules/projectiles/gun_attachables/rail.dm index 7b829d06beecc..b5895dfeb2daf 100644 --- a/code/modules/projectiles/gun_attachables/rail.dm +++ b/code/modules/projectiles/gun_attachables/rail.dm @@ -110,7 +110,7 @@ . = ..() if(!master_gun) return - reequip_component = master_gun.AddComponent(/datum/component/reequip, list(ITEM_SLOT_SUITSTORE, ITEM_SLOT_BELT, ITEM_SLOT_BACK)) + reequip_component = master_gun.AddComponent(/datum/component/reequip, list(SLOT_S_STORE, SLOT_BELT, SLOT_BACK)) /obj/item/attachable/magnetic_harness/on_detach(attaching_item, mob/user) . = ..() diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 498f848d3ec3a..3ab982e19e311 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -511,7 +511,7 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w balloon_alert(usr, "Automatic unloading [CHECK_BITFIELD(reciever_flags, AMMO_RECIEVER_AUTO_EJECT) ? "enabled" : "disabled"].") /obj/item/weapon/gun/item_action_slot_check(mob/user, slot) - if(!(slot & ITEM_SLOT_HANDS) && !CHECK_BITFIELD(item_flags, IS_DEPLOYED)) + if(slot != SLOT_L_HAND && slot != SLOT_R_HAND && !CHECK_BITFIELD(item_flags, IS_DEPLOYED)) return FALSE return TRUE diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 4a8135bfa2544..72cfe9ab563a0 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -224,7 +224,7 @@ /obj/item/weapon/gun/energy/lasgun/pulse/Initialize(mapload, spawn_empty) . = ..() - AddComponent(/datum/component/reequip, list(ITEM_SLOT_BELT)) //Innate mag harness, no more free pulse rifles for you >:( + AddComponent(/datum/component/reequip, list(SLOT_BELT)) //Innate mag harness, no more free pulse rifles for you >:( //------------------------------------------------------- //A practice version of M43, only for memes diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 4580d32111506..02bf48601c910 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1444,7 +1444,7 @@ /obj/item/weapon/gun/rifle/sectoid_rifle/Initialize(mapload, spawn_empty) . = ..() - AddComponent(/datum/component/reequip, list(ITEM_SLOT_BACK)) //Sectoids have alien powers that make them not lose their gun + AddComponent(/datum/component/reequip, list(SLOT_BACK)) //Sectoids have alien powers that make them not lose their gun //only sectoids can fire it /obj/item/weapon/gun/rifle/sectoid_rifle/able_to_fire(mob/user) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index da5778a840913..b07dc407ca90c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1600,7 +1600,7 @@ . = ..() if(!iscarbon(user)) return - if(!(slot & ITEM_SLOT_MASK)) + if(slot != SLOT_WEAR_MASK) owner = null STOP_PROCESSING(SSobj, src) //equipped is triggered when moving from hands to mouth and vice versa return diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index 68dde3c3bb103..13d9bcc74573e 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -28,7 +28,7 @@ to_chat(entering_mob, span_warning("You can't enter the exosuit with other creatures attached to you!")) log_message("Permission denied (Attached mobs).", LOG_MECHA) return FALSE - var/obj/item/I = entering_mob.get_item_by_slot(ITEM_SLOT_BACK) + var/obj/item/I = entering_mob.get_item_by_slot(SLOT_BACK) if(I && istype(I, /obj/item/jetpack_marine)) to_chat(entering_mob, span_warning("Something on your back prevents you from entering the mech!")) return FALSE diff --git a/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx b/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx index 83cd73401c587..2262952658236 100644 --- a/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx +++ b/tgui/packages/tgui/interfaces/PlayerPreferences/DrawOrder.tsx @@ -16,7 +16,7 @@ export const DrawOrder = (props) => {
-
+
{draw_order.map((item) => ( From f48f799b71b46ea8ec964b76d52aa662023b8442 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Sun, 29 Dec 2024 23:47:44 +0100 Subject: [PATCH 15/17] The downgrade to make it work --- code/__DEFINES/equipment.dm | 16 ++++ .../_TGMC/suit_storage/squad_leader.dm | 4 +- .../gamemodes/campaign/outfit_holder.dm | 4 +- code/datums/jobs/job/job.dm | 6 +- code/datums/jobs/job/survivor.dm | 76 ++++--------------- code/datums/jobs/squads.dm | 2 +- code/datums/outfits/_outfit.dm | 68 ++++++++--------- code/datums/outfits/quick_load_outfits.dm | 6 +- code/modules/admin/topic.dm | 2 +- code/modules/clothing/modular_armor/som.dm | 12 +++ code/modules/clothing/under/marine_uniform.dm | 6 ++ code/modules/mob/living/carbon/carbon.dm | 2 +- 12 files changed, 97 insertions(+), 107 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index 0d1105af407ed..cbeef9819fc82 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -289,14 +289,20 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( //Inventory slot strings. These are used for icons. (and checking if an item can be equipped in loadouts for some reason??) #define slot_back_str "slot_back" +#define slot_in_back_str "slot_in_back" #define slot_l_hand_str "slot_l_hand" #define slot_r_hand_str "slot_r_hand" #define slot_w_uniform_str "slot_w_uniform" +#define slot_in_accessory "slot_in_accessory" #define slot_head_str "slot_head" +#define slot_in_head "slot_in_head" #define slot_wear_suit_str "slot_suit" +#define slot_in_suit "slot_in_suit" #define slot_ear_str "slot_ear" #define slot_belt_str "slot_belt" +#define slot_in_belt "slot_in_belt" #define slot_shoes_str "slot_shoes" +#define slot_in_boot "slot_in_boot" #define slot_wear_mask_str "slot_wear_mask" #define slot_handcuffed_str "slot_handcuffed" #define slot_wear_id_str "slot_wear_id" @@ -304,20 +310,28 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define slot_glasses_str "slot_glasses" #define slot_s_store_str "slot_s_store" #define slot_l_store_str "slot_l_store" +#define slot_in_l_store "slot_in_l_store" #define slot_r_store_str "slot_r_store" +#define slot_in_r_store "slot_in_r_store" #define slot_tie_str "slot_tie" ///Correspondance between slot strings and slot numbers GLOBAL_LIST_INIT(slot_str_to_slot, list( "slot_back" = SLOT_BACK, + "slot_in_back_str" = SLOT_IN_BACKPACK, "slot_l_hand" = SLOT_L_HAND, "slot_r_hand" = SLOT_R_HAND, "slot_w_uniform" = SLOT_W_UNIFORM, + "slot_in_accessory" = SLOT_ACCESSORY, "slot_head" = SLOT_HEAD, + "slot_in_head" = SLOT_HEAD, "slot_suit" = SLOT_WEAR_SUIT, + "slot_in_suit" = SLOT_IN_SUIT, "slot_ear" = SLOT_EARS, "slot_belt" = SLOT_BELT, + "slot_in_belt" = SLOT_IN_BELT, "slot_shoes" = SLOT_SHOES, + "slot_in_boot" = SLOT_IN_BOOT, "slot_wear_mask" = SLOT_WEAR_MASK, "slot_handcuffed" = SLOT_HANDCUFFED, "slot_wear_id" = SLOT_WEAR_ID, @@ -325,7 +339,9 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( "slot_glasses" = SLOT_GLASSES, "slot_s_store" = SLOT_S_STORE, "slot_l_store" = SLOT_L_STORE, + "slot_in_l_store" = SLOT_IN_L_POUCH, "slot_r_store" = SLOT_R_STORE, + "slot_in_r_store" = SLOT_IN_R_POUCH, "slot_tie" = SLOT_ACCESSORY, )) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm index b4326b9a8021a..805e4eec81e61 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm @@ -199,11 +199,11 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) - if(loadout.l_store == /obj/item/storage/pouch/magazine/large) + if(loadout.l_pocket == /obj/item/storage/pouch/magazine/large) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_L_POUCH) - if(loadout.r_store == /obj/item/storage/pouch/magazine/large) + if(loadout.r_pocket == /obj/item/storage/pouch/magazine/large) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_R_POUCH) diff --git a/code/datums/gamemodes/campaign/outfit_holder.dm b/code/datums/gamemodes/campaign/outfit_holder.dm index 38c72e8e87ffe..7536888ec83a9 100644 --- a/code/datums/gamemodes/campaign/outfit_holder.dm +++ b/code/datums/gamemodes/campaign/outfit_holder.dm @@ -114,9 +114,9 @@ if(ITEM_SLOT_BACK) loadout.back = new_item?.item_typepath if(ITEM_SLOT_R_POCKET) - loadout.r_store = new_item?.item_typepath + loadout.r_pocket = new_item?.item_typepath if(ITEM_SLOT_L_POCKET) - loadout.l_store = new_item?.item_typepath + loadout.l_pocket = new_item?.item_typepath if(ITEM_SLOT_SUITSTORE) loadout.suit_store = new_item?.item_typepath if(ITEM_SLOT_SECONDARY) diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm index ab3651799a08e..aedf5c6ce5a3b 100644 --- a/code/datums/jobs/job/job.dm +++ b/code/datums/jobs/job/job.dm @@ -286,7 +286,7 @@ GLOBAL_PROTECT(exp_specialmap) if(!admin_action) stack_trace("[src] had an ID when apply_outfit_to_spawn() ran") QDEL_NULL(wear_id) - equip_to_slot_or_del(id_card, ITEM_SLOT_ID) + equip_to_slot_or_del(id_card, SLOT_WEAR_ID) if(player && isnull(job.outfit.back) && player.prefs.backpack > BACK_NOTHING) var/obj/item/storage/backpack/new_backpack @@ -295,9 +295,9 @@ GLOBAL_PROTECT(exp_specialmap) new_backpack = new /obj/item/storage/backpack/marine(src) if(BACK_SATCHEL) new_backpack = new /obj/item/storage/backpack/marine/satchel(src) - equip_to_slot_or_del(new_backpack, ITEM_SLOT_BACK) + equip_to_slot_or_del(new_backpack, SLOT_BACK) - job.outfit.handle_id(src, player) + job.outfit.handle_id(src) equip_role_outfit(job) diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm index 690080603f925..b0f9073cc3ef0 100644 --- a/code/datums/jobs/job/survivor.dm +++ b/code/datums/jobs/job/survivor.dm @@ -11,26 +11,26 @@ . = ..() //todo this should be handled better if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(spawned_carbon), ITEM_SLOT_HEAD) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit(spawned_carbon), ITEM_SLOT_OCLOTHING) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather(spawned_carbon), ITEM_SLOT_MASK) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(spawned_carbon), ITEM_SLOT_FEET) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(spawned_carbon), ITEM_SLOT_GLOVES) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(spawned_carbon), SLOT_HEAD) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit(spawned_carbon), SLOT_W_UNIFORM) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather(spawned_carbon), SLOT_WEAR_MASK) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/shoes/snow(spawned_carbon), SLOT_SHOES) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(spawned_carbon), SLOT_GLOVES) var/weapons = pick(SURVIVOR_WEAPONS) var/obj/item/weapon/picked_weapon = weapons[1] var/obj/item/ammo_magazine/picked_ammo = weapons[2] - spawned_carbon.equip_to_slot_or_del(new /obj/item/belt_harness(spawned_carbon), ITEM_SLOT_BELT) + spawned_carbon.equip_to_slot_or_del(new /obj/item/belt_harness(spawned_carbon), SLOT_BELT) spawned_carbon.put_in_hands(new picked_weapon(spawned_carbon)) - spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) - spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) - spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) - spawned_carbon.equip_to_slot_or_del(new /obj/item/weapon/combat_knife(spawned_carbon), ITEM_SLOT_BACK, FALSE, TRUE) + spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), SLOT_IN_BACKPACK) + spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), SLOT_IN_BACKPACK) + spawned_carbon.equip_to_slot_or_del(new picked_ammo(spawned_carbon), SLOT_IN_BACKPACK) + spawned_carbon.equip_to_slot_or_del(new /obj/item/weapon/combat_knife(spawned_carbon), SLOT_IN_BACKPACK) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(spawned_carbon), ITEM_SLOT_EYES) - spawned_carbon.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(spawned_carbon), ITEM_SLOT_R_POCKET) - spawned_carbon.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(spawned_carbon), ITEM_SLOT_L_POCKET) - spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/rugged(spawned_carbon), ITEM_SLOT_HEAD) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(spawned_carbon), SLOT_GLASSES) + spawned_carbon.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(spawned_carbon), SLOT_R_STORE) + spawned_carbon.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(spawned_carbon), SLOT_L_STORE) + spawned_carbon.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/rugged(spawned_carbon), SLOT_HEAD) switch(SSmapping.configs[GROUND_MAP].map_name) if(MAP_PRISON_STATION) @@ -165,50 +165,6 @@ Good luck, but do not expect to survive."}) title = "Bartender Survivor" outfit = /datum/outfit/job/survivor/bartender - w_uniform = /obj/item/clothing/under/rank/chemist - wear_suit = /obj/item/clothing/suit/storage/labcoat/chemist - back = /obj/item/storage/backpack/satchel/chem - belt = /obj/item/storage/belt/hypospraybelt - gloves = /obj/item/clothing/gloves/latex - shoes = /obj/item/clothing/shoes/white - ears = /obj/item/radio/survivor - glasses = /obj/item/clothing/glasses/science - l_store = /obj/item/flashlight - r_store = /obj/item/tool/crowbar - suit_store = /obj/item/healthanalyzer - -/datum/outfit/job/survivor/chemist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/bicaridine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/kelotane, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tramadol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/tricordrazine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/lemoline/doctor, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/beaker/large, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/beaker/large, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/bicaridine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/kelotane, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tramadol, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/tricordrazine, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/dylovene, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/inaprovaline, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/hypervene, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/imialky, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/syringe_case/empty, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/storage/syringe_case/empty, SLOT_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/reagent_containers/dropper, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/bruise_pack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/advanced/burn_pack, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, SLOT_IN_BACKPACK) - //Roboticist Survivor /datum/job/survivor/roboticist @@ -228,8 +184,8 @@ Good luck, but do not expect to survive."}) back = /obj/item/storage/backpack/satchel/tox ears = /obj/item/radio/survivor glasses = /obj/item/clothing/glasses/welding/flipped - l_store = /obj/item/storage/pouch/electronics/full - r_store = /obj/item/flashlight/combat + l_pocket = /obj/item/storage/pouch/electronics/full + r_pocket = /obj/item/flashlight/combat /datum/outfit/job/survivor/roboticist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() diff --git a/code/datums/jobs/squads.dm b/code/datums/jobs/squads.dm index 548e700a14610..42698129189bc 100644 --- a/code/datums/jobs/squads.dm +++ b/code/datums/jobs/squads.dm @@ -202,7 +202,7 @@ if(new_squaddie.wear_ear) new_squaddie.dropItemToGround(new_squaddie.wear_ear) headset = new() - new_squaddie.equip_to_slot_or_del(headset, ITEM_SLOT_EARS) + new_squaddie.equip_to_slot_or_del(headset, SLOT_EARS) if(istype(headset)) headset.set_frequency(radio_freq) diff --git a/code/datums/outfits/_outfit.dm b/code/datums/outfits/_outfit.dm index cad8337bb734e..786583ff97904 100644 --- a/code/datums/outfits/_outfit.dm +++ b/code/datums/outfits/_outfit.dm @@ -90,14 +90,14 @@ /datum/outfit/New() . = ..() - container_list["slot_back"] = backpack_contents - container_list["slot_belt"] = belt_contents - container_list["slot_shoes"] = shoe_contents - container_list["slot_suit"] = suit_contents - container_list["slot_w_uniform"] = webbing_contents - container_list["slot_head"] = head_contents - container_list["slot_r_store"] = r_pocket_contents - container_list["slot_l_store"] = l_pocket_contents + container_list["slot_in_back"] = backpack_contents + container_list["slot_in_belt"] = belt_contents + container_list["slot_in_boot"] = shoe_contents + container_list["slot_in_suit"] = suit_contents + container_list["slot_in_accessory"] = webbing_contents + container_list["slot_in_head"] = head_contents + container_list["slot_in_r_store"] = r_pocket_contents + container_list["slot_in_l_store"] = l_pocket_contents /// This gets ran before we equip any items from the variables /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -114,32 +114,32 @@ //Start with uniform,suit,backpack for additional slots if(w_uniform) - equipping_human.equip_to_slot_or_del(new w_uniform(equipping_human), ITEM_SLOT_ICLOTHING, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new w_uniform(equipping_human), SLOT_W_UNIFORM, override_nodrop = TRUE) if(wear_suit) - equipping_human.equip_to_slot_or_del(new wear_suit(equipping_human), ITEM_SLOT_OCLOTHING, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new wear_suit(equipping_human), SLOT_WEAR_SUIT, override_nodrop = TRUE) if(back) - equipping_human.equip_to_slot_or_del(new back(equipping_human), ITEM_SLOT_BACK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new back(equipping_human), SLOT_BACK, override_nodrop = TRUE) if(belt) - equipping_human.equip_to_slot_or_del(new belt(equipping_human), ITEM_SLOT_BELT, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new belt(equipping_human), SLOT_BELT, override_nodrop = TRUE) if(gloves) - equipping_human.equip_to_slot_or_del(new gloves(equipping_human), ITEM_SLOT_GLOVES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new gloves(equipping_human), SLOT_GLOVES, override_nodrop = TRUE) if(shoes) - equipping_human.equip_to_slot_or_del(new shoes(equipping_human), ITEM_SLOT_FEET, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new shoes(equipping_human), SLOT_SHOES, override_nodrop = TRUE) if(head) - equipping_human.equip_to_slot_or_del(new head(equipping_human), ITEM_SLOT_HEAD, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new head(equipping_human), SLOT_HEAD, override_nodrop = TRUE) if(mask) - equipping_human.equip_to_slot_or_del(new mask(equipping_human), ITEM_SLOT_MASK, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new mask(equipping_human), SLOT_WEAR_MASK, override_nodrop = TRUE) if(ears) if(visualsOnly) - equipping_human.equip_to_slot_or_del(new /obj/item/radio/headset(equipping_human), ITEM_SLOT_EARS, override_nodrop = TRUE) //We don't want marine cameras. For now they have the same worn_icon_state as the rest. + equipping_human.equip_to_slot_or_del(new /obj/item/radio/headset(equipping_human), SLOT_EARS, override_nodrop = TRUE) //We don't want marine cameras. For now they have the same worn_icon_state as the rest. else - equipping_human.equip_to_slot_or_del(new ears(equipping_human), ITEM_SLOT_EARS, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new ears(equipping_human), SLOT_EARS, override_nodrop = TRUE) if(glasses) - equipping_human.equip_to_slot_or_del(new glasses(equipping_human), ITEM_SLOT_EYES, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new glasses(equipping_human), SLOT_GLASSES, override_nodrop = TRUE) if(id) - equipping_human.equip_to_slot_or_del(new id(equipping_human), ITEM_SLOT_ID, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new id(equipping_human), SLOT_WEAR_ID, override_nodrop = TRUE) if(suit_store) - equipping_human.equip_to_slot_or_del(new suit_store(equipping_human), ITEM_SLOT_SUITSTORE, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new suit_store(equipping_human), SLOT_S_STORE, override_nodrop = TRUE) if(l_hand) equipping_human.put_in_l_hand(new l_hand(equipping_human)) if(r_hand) @@ -147,9 +147,9 @@ if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - equipping_human.equip_to_slot_or_del(new l_pocket(equipping_human), ITEM_SLOT_L_POCKET, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new l_pocket(equipping_human), SLOT_L_STORE, override_nodrop = TRUE) if(r_pocket) - equipping_human.equip_to_slot_or_del(new r_pocket(equipping_human), ITEM_SLOT_R_POCKET, override_nodrop = TRUE) + equipping_human.equip_to_slot_or_del(new r_pocket(equipping_human), SLOT_R_STORE, override_nodrop = TRUE) for(var/slot in container_list) for(var/path in container_list[slot]) @@ -157,7 +157,7 @@ if(!isnum(number))//Default to 1 number = 1 for(var/i in 1 to number) - if(!equipping_human.equip_to_slot_or_del(new path(equipping_human), GLOB.slot_str_to_slot[slot], TRUE, TRUE)) + if(!equipping_human.equip_to_slot_or_del(new path(equipping_human), GLOB.slot_str_to_slot[slot], TRUE)) stack_trace("Failed to place item of type [path] from list in slot [slot] in outfit of type [type]!") post_equip(equipping_human, visualsOnly) @@ -190,14 +190,14 @@ .["suit_store"] = suit_store .["r_hand"] = r_hand .["l_hand"] = l_hand - .["backpack_contents"] = backpack_contents - .["belt_contents"] = belt_contents - .["shoe_contents"] = shoe_contents - .["suit_contents"] = suit_contents - .["webbing_contents"] = webbing_contents - .["head_contents"] = head_contents - .["r_pocket_contents"] = r_pocket_contents - .["l_pocket_contents"] = l_pocket_contents + .["slot_in_back"] = backpack_contents + .["slot_in_belt"] = belt_contents + .["slot_in_boot"] = shoe_contents + .["slot_in_suit"] = suit_contents + .["slot_in_accessory"] = webbing_contents + .["slot_in_head"] = head_contents + .["slot_in_r_store"] = r_pocket_contents + .["slot_in_l_store"] = l_pocket_contents .["implants"] = implants /// Copy most vars from another outfit to this one @@ -299,8 +299,8 @@ ears = human_mob.wear_ear?.type glasses = human_mob.glasses?.type id = human_mob.wear_id?.type - l_pocket = human_mob.l_pocket?.type - r_pocket = human_mob.r_pocket?.type + l_pocket = human_mob.l_store?.type + r_pocket = human_mob.r_store?.type /datum/outfit/vv_get_dropdown() . = ..() diff --git a/code/datums/outfits/quick_load_outfits.dm b/code/datums/outfits/quick_load_outfits.dm index 4bb80e58b2c9f..6835da6196b33 100644 --- a/code/datums/outfits/quick_load_outfits.dm +++ b/code/datums/outfits/quick_load_outfits.dm @@ -866,7 +866,7 @@ /datum/outfit/quick/tgmc/leader/standard_assaultrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) /datum/outfit/quick/tgmc/leader/standard_carbine name = "AR-18 Patrol Leader" @@ -921,7 +921,7 @@ /datum/outfit/quick/tgmc/leader/combat_rifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) /datum/outfit/quick/tgmc/leader/standard_battlerifle name = "BR-64 Patrol Leader" @@ -1000,7 +1000,7 @@ /datum/outfit/quick/tgmc/leader/standard_laserrifle/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), ITEM_SLOT_BACK, FALSE, TRUE) + H.equip_to_slot_or_del(new /obj/item/hud_tablet(H, /datum/job/terragov/squad/leader, H.assigned_squad), SLOT_IN_BACKPACK) /datum/outfit/quick/tgmc/leader/oicw name = "AR-55 Patrol Leader" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b6806f7e38f1b..453db73de3750 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1963,7 +1963,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] if("createid") if(!istype(H) || H.wear_id) return - H.equip_to_slot_or_del(new /obj/item/card/id(H), ITEM_SLOT_ID) + H.equip_to_slot_or_del(new /obj/item/card/id(H), SLOT_WEAR_ID) if("squad") previous = H.assigned_squad change = input("Choose the marine's new squad.", "Change Squad") as null|anything in SSjob.squads diff --git a/code/modules/clothing/modular_armor/som.dm b/code/modules/clothing/modular_armor/som.dm index c0372e9a49519..5c5a520aae2a9 100644 --- a/code/modules/clothing/modular_armor/som.dm +++ b/code/modules/clothing/modular_armor/som.dm @@ -55,6 +55,12 @@ /obj/item/armor_module/storage/general/som, ) +/obj/item/clothing/suit/modular/som/medstorage + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/medical/som, + ) + /obj/item/clothing/suit/modular/som/shield starting_attachments = list( /obj/item/armor_module/module/eshield/som, @@ -138,6 +144,12 @@ /obj/item/armor_module/storage/medical/som, ) +/obj/item/clothing/suit/modular/som/heavy/pyro/genstorage + starting_attachments = list( + /obj/item/armor_module/module/fire_proof/som, + /obj/item/armor_module/storage/general/som, + ) + /obj/item/clothing/suit/modular/som/heavy/lorica starting_attachments = list( /obj/item/armor_module/module/tyr_extra_armor/som, diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index cd7488bbe4052..c80f7be52a01a 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -490,6 +490,9 @@ /obj/item/clothing/under/som/medic/vest starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) +/obj/item/clothing/under/som/medic/vest/black + starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + /obj/item/clothing/under/som/veteran name = "\improper SOM veteran uniform" desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies. This one has markings indicating specialist status." @@ -626,6 +629,9 @@ /obj/item/clothing/under/vsd/upp/webbing starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) +/obj/item/clothing/under/vsd/upp/white_webbing + starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) + /obj/item/clothing/under/vsd/shirt name = "V.S.D shirt" icon_state = "vsd_shirt" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0b755a9b83ced..b3f6102ff30c7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -319,7 +319,7 @@ if(!G || !gear.Find(i)) continue if(!equip_to_slot_or_del(new G.path, G.slot)) //try to put in the slot it says its supposed to go, if you can't: put it in a bag - equip_to_slot_or_del(new G.path, ITEM_SLOT_BACK, FALSE, TRUE) + equip_to_slot_or_del(new G.path, SLOT_IN_BACKPACK) /mob/living/carbon/human/update_sight() if(!client) From 29339b97e0b2410f76fc7a667519ccc5e0ca3530 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Mon, 30 Dec 2024 17:36:19 +0100 Subject: [PATCH 16/17] Fix stupid mistakes --- code/__DEFINES/equipment.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index cbeef9819fc82..c0794104d32ba 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -293,6 +293,7 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define slot_l_hand_str "slot_l_hand" #define slot_r_hand_str "slot_r_hand" #define slot_w_uniform_str "slot_w_uniform" +#define slot_accessory_str "slot_accessory" #define slot_in_accessory "slot_in_accessory" #define slot_head_str "slot_head" #define slot_in_head "slot_in_head" @@ -313,18 +314,18 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( #define slot_in_l_store "slot_in_l_store" #define slot_r_store_str "slot_r_store" #define slot_in_r_store "slot_in_r_store" -#define slot_tie_str "slot_tie" ///Correspondance between slot strings and slot numbers GLOBAL_LIST_INIT(slot_str_to_slot, list( "slot_back" = SLOT_BACK, - "slot_in_back_str" = SLOT_IN_BACKPACK, + "slot_in_back" = SLOT_IN_BACKPACK, "slot_l_hand" = SLOT_L_HAND, "slot_r_hand" = SLOT_R_HAND, "slot_w_uniform" = SLOT_W_UNIFORM, - "slot_in_accessory" = SLOT_ACCESSORY, + "slot_accessory" = SLOT_ACCESSORY, + "slot_in_accessory" = SLOT_IN_ACCESSORY, "slot_head" = SLOT_HEAD, - "slot_in_head" = SLOT_HEAD, + "slot_in_head" = SLOT_IN_HEAD, "slot_suit" = SLOT_WEAR_SUIT, "slot_in_suit" = SLOT_IN_SUIT, "slot_ear" = SLOT_EARS, @@ -342,7 +343,6 @@ GLOBAL_LIST_INIT(slot_str_to_slot, list( "slot_in_l_store" = SLOT_IN_L_POUCH, "slot_r_store" = SLOT_R_STORE, "slot_in_r_store" = SLOT_IN_R_POUCH, - "slot_tie" = SLOT_ACCESSORY, )) //I hate that this has to exist From f0fcbf86631d28e01e170eaae7948aead71bb92b Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Mon, 30 Dec 2024 22:45:42 +0100 Subject: [PATCH 17/17] Update code/__DEFINES/equipment.dm Co-authored-by: QualityVan --- code/__DEFINES/equipment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index c0794104d32ba..2eab36c1c4f12 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -289,7 +289,7 @@ GLOBAL_LIST_INIT(inventory_slots_to_string, list( //Inventory slot strings. These are used for icons. (and checking if an item can be equipped in loadouts for some reason??) #define slot_back_str "slot_back" -#define slot_in_back_str "slot_in_back" +#define slot_in_back "slot_in_back" #define slot_l_hand_str "slot_l_hand" #define slot_r_hand_str "slot_r_hand" #define slot_w_uniform_str "slot_w_uniform"