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

Merge branch 'master' into upstream-merge-32183

Browse Source
This commit is contained in:
LetterJay
2017-11-12 23:09:55 -06:00
committed by GitHub
parent d5a60212b9 3ea8808201
commit 14944d8711
689 changed files with 16817 additions and 22502 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)
code/modules/reagents/reagent_containers/bottle.dm
+2 -2
View File
@@ -73,8 +73,8 @@
list_reagents = list("chloralhydrate" = 15)
/obj/item/reagent_containers/glass/bottle/charcoal
name = "antitoxin bottle"
desc = "A small bottle of charcoal."
name = "charcoal bottle"
desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
list_reagents = list("charcoal" = 30)
/obj/item/reagent_containers/glass/bottle/mutagen
code/modules/reagents/reagent_containers/glass.dm
+1 -1
View File
@@ -217,7 +217,7 @@
list_reagents = list("silver_sulfadiazine" = 50)
/obj/item/reagent_containers/glass/beaker/large/charcoal
name = "antitoxin reserve tank"
name = "charcoal reserve tank"
list_reagents = list("charcoal" = 50)
/obj/item/reagent_containers/glass/beaker/large/epinephrine