cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oxygen canisters are blue again.

Browse Source 
Added missing <br> to "Constructions" menu.
dsay was rolled back.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@758 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-01-03 21:00:01 +00:00
parent 4409d08d5f
commit 0e1ed7920d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/atmoalter/canister.dm
View File

@@ -29,6 +29,8 @@
/obj/machinery/portable_atmospherics/canister/oxygen /obj/machinery/portable_atmospherics/canister/oxygen
name = "Canister: \[O2\]" name = "Canister: \[O2\]"
icon_state = "blue" icon_state = "blue"
color = "blue"
labeled = 1
/obj/machinery/portable_atmospherics/canister/toxins /obj/machinery/portable_atmospherics/canister/toxins
name = "Canister \[Toxin (Bio)\]" name = "Canister \[Toxin (Bio)\]"
icon_state = "orange" icon_state = "orange"

2
code/game/objects/stacks/stack.dm
View File

@@ -116,7 +116,7 @@
if (!src || amount<=0) if (!src || amount<=0)
user << browse(null, "window=stack") user << browse(null, "window=stack")
user.machine = src //for correct work of onclose user.machine = src //for correct work of onclose
var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []", src, src.amount) var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []<br>", src, src.amount)
for(var/i=1;i<=recipes.len,i++) for(var/i=1;i<=recipes.len,i++)
var/datum/stack_recipe/R = recipes[i] var/datum/stack_recipe/R = recipes[i]
if (isnull(R)) if (isnull(R))

4
code/modules/admin/verbs/deadsay.dm
View File

@@ -17,8 +17,8 @@
if (!msg) if (!msg)
return return
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.stealth ? src.fakekey : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>" var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.stealth ? pick("BADMIN", "ViktoriaSA", "Drunkwaffel", "Android Datuhh") : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
//pick("BADMIN", "ViktoriaSA", "Drunkwaffel", "Android Datuhh")
for (var/mob/M in world) for (var/mob/M in world)
if(M.stat == 2 || (M.client && M.client.holder)) if(M.stat == 2 || (M.client && M.client.holder))
M.show_message(rendered, 2) M.show_message(rendered, 2)