From 43a349ee2ac97cb0153d918e2cd48556ae49f96b Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:25:45 +0930 Subject: [PATCH 1/4] Fixes #11022 --- code/controllers/emergency_shuttle_controller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 7e0d1e2d25c..aa13f07510a 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -24,7 +24,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle /datum/emergency_shuttle_controller/proc/process() if (wait_for_launch) - if (auto_recall && world.time >= auto_recall_time) + if (evac && auto_recall && world.time >= auto_recall_time) recall() if (world.time >= launch_time) //time to launch the shuttle stop_launch_countdown() From 88b95e1207d7fa034ed8dace76fe0e34c558a794 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:40:23 +0930 Subject: [PATCH 2/4] Fixes #7951 --- .../objects/items/weapons/implants/implanter.dm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 4f2c491d6b4..31fc7b31cc9 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -8,17 +8,24 @@ w_class = 2.0 var/obj/item/weapon/implant/imp = null +/obj/item/weapon/implanter/attack_self(var/mob/user) + if(!imp) + return ..() + imp.loc = get_turf(src) + user.put_in_hands(imp) + user << "You remove \the [imp] from \the [src]." + name = "implanter" + imp = null + update() + return + /obj/item/weapon/implanter/proc/update() - - -/obj/item/weapon/implanter/update() if (src.imp) src.icon_state = "implanter1" else src.icon_state = "implanter0" return - /obj/item/weapon/implanter/attack(mob/M as mob, mob/user as mob) if (!istype(M, /mob/living/carbon)) return @@ -52,8 +59,6 @@ return - - /obj/item/weapon/implanter/loyalty name = "implanter-loyalty" From c2908bfc503b94b9f8a69151763b1d1b66945258 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:43:12 +0930 Subject: [PATCH 3/4] Fixes #10951 --- code/modules/nano/modules/human_appearance.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/nano/modules/human_appearance.dm b/code/modules/nano/modules/human_appearance.dm index 069a2195465..9c533c04384 100644 --- a/code/modules/nano/modules/human_appearance.dm +++ b/code/modules/nano/modules/human_appearance.dm @@ -93,6 +93,10 @@ return 0 /obj/nano_module/appearance_changer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) + + if(!owner || !owner.species) + return + generate_data(check_whitelist, whitelist, blacklist) var/data[0] From 211e4260099a269d65a00fcfe198bf84fa642570 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:43:20 +0930 Subject: [PATCH 4/4] Tweak. --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 55349977310..a66c619b08d 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -778,7 +778,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(confirm != "Yes") return var/choice - if(ticker.mode.name == "revolution" || ticker.mode.name == "confliction") + if(ticker.mode.auto_recall_shuttle) choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel") if(choice == "Confirm") emergency_shuttle.auto_recall = 1 //enable auto-recall