From ee40390ffeaf7d2e663877e91c15ed8871404fbb Mon Sep 17 00:00:00 2001 From: pinatacolada Date: Mon, 25 Apr 2016 17:47:46 +0100 Subject: [PATCH] Plasma security now spawn with their gun in the bag Fixes #4071 Warden, officers, and pod pilot spawn with the taser in their bag. Head of Security spawns with egun in the bag. Brig physician spawns with pen light in their bag. Also made other species pod pilots spawn with the taser in their bomber jacket, since it now can hold it, and is more consistent with the rest of the officers :cl: pinatacolada fix: Plasmamen security now spawn with their suit slot items in their bags tweak: Pod pilots spawn with taser in the suit slot /:cl: --- code/game/jobs/job/security.dm | 2 +- .../mob/living/carbon/human/species/plasmaman.dm | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index cc8caa6284e..3b13ceb6b64 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -249,7 +249,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/security(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) - H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_belt) + H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 76c06871250..42d11702ab6 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -58,12 +58,20 @@ if("Life Support Specialist") suit=/obj/item/clothing/suit/space/eva/plasmaman/atmostech helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech - if("Warden","Detective","Security Officer","Security Pod Pilot") + if("Detective") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/ helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/ - if("Head of Security", "Magistrate") + if("Warden","Security Officer","Security Pod Pilot") + suit=/obj/item/clothing/suit/space/eva/plasmaman/security/ + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/ + H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_in_backpack) + if("Magistrate") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/hos helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/hos + if("Head of Security") + suit=/obj/item/clothing/suit/space/eva/plasmaman/security/hos + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/hos + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_in_backpack) if("Captain", "Blueshield") suit=/obj/item/clothing/suit/space/eva/plasmaman/security/captain helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/captain @@ -73,6 +81,7 @@ if("Medical Doctor","Brig Physician") suit=/obj/item/clothing/suit/space/eva/plasmaman/medical helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical + H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_in_backpack) if("Paramedic") suit=/obj/item/clothing/suit/space/eva/plasmaman/medical/paramedic helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical/paramedic