From a98a1356ef3b4fad9c91ccff254bdb17b3fe0f2f Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Tue, 17 Apr 2012 21:21:17 +0000 Subject: [PATCH] The Chief Engineer, Engineers, and Atmos Techs all now have their PDAs spawn in their pocket, and their toolbelts on their belt. Nuke gibbing now happens at the end of the cinematic now, which should prevent the runtimes it was causing. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3476 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/nuclear/nuclearbomb.dm | 7 +++++-- code/game/jobs/job/engineering.dm | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 13fe68d4dd1..5204eecb35f 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -184,10 +184,13 @@ if(M.client) spawn(0) M.client.station_explosion_cinematic(off_station) - if(M.z==1) - M.gib() sleep(110) + for(var/mob/M in world) + if(M.z==1) + spawn(0) + M.gib() + if (ticker && ticker.mode) ticker.mode.explosion_in_progress = 0 if(ticker.mode.name == "nuclear emergency") diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 1342930800f..76204550376 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -16,10 +16,10 @@ if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/chief_engineer(H), H.slot_w_uniform) - H.equip_if_possible(new /obj/item/device/pda/heads/ce(H), H.slot_belt) + H.equip_if_possible(new /obj/item/device/pda/heads/ce(H), H.slot_l_store) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat/white(H), H.slot_head) - H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_l_hand) + H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves) if(H.backbag == 1) H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand) @@ -47,10 +47,10 @@ if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/engineer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/orange(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt) + H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(H), H.slot_head) - H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_l_hand) H.equip_if_possible(new /obj/item/device/t_scanner(H), H.slot_r_store) + H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_l_store) if(H.backbag == 1) H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand) else @@ -77,8 +77,8 @@ if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/atmospheric_technician(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt) - H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/atmostech/(H), H.slot_l_hand) + H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_l_store) + H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/atmostech/(H), H.slot_belt) if(H.backbag == 1) H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand) else