From d574d60e26e94a1542f4e5486796c0d7cca7dfa2 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 21 Dec 2015 15:00:25 -0500 Subject: [PATCH 1/4] Canisters now work in unpowered areas. --- code/game/machinery/atmoalter/canister.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 9a8228aaa6d..458e787b79d 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -17,6 +17,7 @@ var/temperature_resistance = 1000 + T0C volume = 1000 use_power = 0 + interact_offline = 1 // Allows this to be used when not in powered area. var/release_log = "" var/update_flag = 0 From 5873a92df83756720befb5b31dc89753068f6ff3 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 21 Dec 2015 15:30:26 -0500 Subject: [PATCH 2/4] Fixes the icon for numbness. Resolves #11435 --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f8abe2778ba..ddd0c9ef8c3 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1266,7 +1266,7 @@ if(healths) if (analgesic > 100) - healths.icon_state = "health_health_numb" + healths.icon_state = "health_numb" else switch(hal_screwyhud) if(1) healths.icon_state = "health6" From fe62634775bb74ff359dcfdb0cef49a88b0903c2 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 21 Dec 2015 17:53:53 -0500 Subject: [PATCH 3/4] Stumpy hands and arms can no longer pull stuff out of bags and such. Resolves #11404 --- code/game/objects/items.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index fef7336371c..f7215086e80 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -151,6 +151,9 @@ if(temp && !temp.is_usable()) user << "You try to move your [temp.name], but cannot!" return + if(!temp) + user << "You try to use your hand, but realize it is no longer attached!" + return src.pickup(user) if (istype(src.loc, /obj/item/weapon/storage)) var/obj/item/weapon/storage/S = src.loc From d7eaed8c6793294347a52364bae0b4d8f7261293 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 22 Dec 2015 10:59:33 +0100 Subject: [PATCH 4/4] Span correction. --- code/game/objects/items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6e7d2820f73..1a00c49ea7e 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -157,7 +157,7 @@ user << "You try to move your [temp.name], but cannot!" return if(!temp) - user << "You try to use your hand, but realize it is no longer attached!" + user << "You try to use your hand, but realize it is no longer attached!" return src.pickup(user) if (istype(src.loc, /obj/item/weapon/storage))