From 0e1ed7920df0082b0123f2a49a53e0963f07afa8 Mon Sep 17 00:00:00 2001 From: "rastaf.zero@gmail.com" Date: Mon, 3 Jan 2011 21:00:01 +0000 Subject: [PATCH] Oxygen canisters are blue again. Added missing
to "Constructions" menu. dsay was rolled back. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@758 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/atmoalter/canister.dm | 2 ++ code/game/objects/stacks/stack.dm | 2 +- code/modules/admin/verbs/deadsay.dm | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index f82205af0c..10be6d267c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -29,6 +29,8 @@ /obj/machinery/portable_atmospherics/canister/oxygen name = "Canister: \[O2\]" icon_state = "blue" + color = "blue" + labeled = 1 /obj/machinery/portable_atmospherics/canister/toxins name = "Canister \[Toxin (Bio)\]" icon_state = "orange" diff --git a/code/game/objects/stacks/stack.dm b/code/game/objects/stacks/stack.dm index 4a81fe9a3a..766ce6ad3a 100644 --- a/code/game/objects/stacks/stack.dm +++ b/code/game/objects/stacks/stack.dm @@ -116,7 +116,7 @@ if (!src || amount<=0) user << browse(null, "window=stack") user.machine = src //for correct work of onclose - var/t1 = text("Constructions from []Amount Left: []", src, src.amount) + var/t1 = text("Constructions from []Amount Left: []
", src, src.amount) for(var/i=1;i<=recipes.len,i++) var/datum/stack_recipe/R = recipes[i] if (isnull(R)) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index ed55ef1f76..26b02db09f 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -17,8 +17,8 @@ if (!msg) return - var/rendered = "DEAD: ADMIN([src.stealth ? src.fakekey : src.key]) says, \"[msg]\"" - //pick("BADMIN", "ViktoriaSA", "Drunkwaffel", "Android Datuhh") + var/rendered = "DEAD: ADMIN([src.stealth ? pick("BADMIN", "ViktoriaSA", "Drunkwaffel", "Android Datuhh") : src.key]) says, \"[msg]\"" + for (var/mob/M in world) if(M.stat == 2 || (M.client && M.client.holder)) M.show_message(rendered, 2) \ No newline at end of file