From aa2564b798da9fe198565bdf1cd9e7b6b17fd465 Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Sun, 31 May 2015 14:03:41 -0400 Subject: [PATCH] Fixes #9556 Also fixes missing backpacks for assistants. --- code/game/jobs/job/assistant.dm | 4 ++++ code/game/jobs/job/captain.dm | 1 - code/game/jobs/job_controller.dm | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index def0a007f70..98c7a4dd986 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -14,6 +14,10 @@ /datum/job/assistant/equip(var/mob/living/carbon/human/H) if(!H) return 0 + switch(H.backbag) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) return 1 diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 00d304b9031..4b9d72ff51c 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -23,7 +23,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) if(H.age>49) U.accessories += new /obj/item/clothing/accessory/medal/gold/captain(U) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index b7c7fed42b3..b78b802e911 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -472,11 +472,6 @@ var/global/datum/controller/occupations/job_master var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP)? null : sound('sound/misc/boatswain.ogg', volume=20) captain_announcement.Announce("All hands, Captain [H.real_name] on deck!", new_sound=announce_sound) - if(istype(H.back, /obj/item/weapon/storage)) - new /obj/item/weapon/storage/box/survival(H.back) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - //Deferred item spawning. if(spawn_in_storage && spawn_in_storage.len) var/obj/item/weapon/storage/B