shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

512 forward compatibility merge

Browse Source
This commit is contained in:
Jordan Brown
2017-10-29 11:27:46 -04:00
committed by CitadelStationBot
parent fd2705b6e6
commit 4b297f509e
227 changed files with 5060 additions and 2003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+5 -5
View File
@@ -248,14 +248,14 @@
"}
if (is_beaker_ready)
if(!is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
dat += "<A href='?src=\ref[src];action=grind'>Grind the reagents</a><BR>"
dat += "<A href='?src=\ref[src];action=juice'>Juice the reagents</a><BR><BR>"
dat += "<A href='?src=[REF(src)];action=grind'>Grind the reagents</a><BR>"
dat += "<A href='?src=[REF(src)];action=juice'>Juice the reagents</a><BR><BR>"
else if (beaker.reagents.total_volume)
dat += "<A href='?src=\ref[src];action=mix'>Mix the reagents</a><BR><BR>"
dat += "<A href='?src=[REF(src)];action=mix'>Mix the reagents</a><BR><BR>"
if(length(holdingitems))
dat += "<A href='?src=\ref[src];action=eject'>Eject the reagents</a><BR>"
dat += "<A href='?src=[REF(src)];action=eject'>Eject the reagents</a><BR>"
if(beaker)
dat += "<A href='?src=\ref[src];action=detach'>Detach the beaker</a><BR>"
dat += "<A href='?src=[REF(src)];action=detach'>Detach the beaker</a><BR>"
else
dat += "Please wait..."
code/modules/reagents/chemistry/recipes.dm
+1 -1
View File
@@ -37,7 +37,7 @@
var/turf/T = get_turf(A)
var/area/my_area = get_area(T)
var/message = "A [reaction_name] reaction has occurred in [my_area.name] [ADMIN_COORDJMP(T)]"
message += " (<A HREF='?_src_=vars;Vars=\ref[A]'>VV</A>)"
message += " (<A HREF='?_src_=vars;Vars=[REF(A)]'>VV</A>)"
var/mob/M = get(A, /mob)
if(M)