more fixes and features

This commit is contained in:
Fox-McCloud
2017-01-25 01:04:01 -05:00
parent 36bfee25dc
commit 084ed30446
5 changed files with 10 additions and 5 deletions
@@ -88,6 +88,7 @@
icon_state = "glowberrypile"
filling_color = "#7CFC00"
origin_tech = "plasmatech=6"
light_color = "#006622"
// Cherries
/obj/item/seeds/cherry
@@ -231,6 +231,7 @@
filling_color = "#00FA9A"
var/effect_path = /obj/effect/glowshroom
origin_tech = "biotech=4;plasmatech=6"
light_color = "#006622"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(istype(user.loc, /turf/space))
@@ -267,3 +268,4 @@
filling_color = "#00FA9A"
effect_path = /obj/effect/glowshroom/glowcap
origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
light_color = "#8E0300"
+1 -1
View File
@@ -143,7 +143,7 @@
if(!burning && CheckOxygen())
icon_state = "bonfire_on_fire"
burning = 1
set_light(6)
set_light(6, l_color = "#ED9200")
Burn()
processing_objects.Add(src)
@@ -203,12 +203,12 @@
[beaker_contents]<hr>
"}
if (is_beaker_ready && !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=[src.UID()];action=grind'>Grind the reagents</a><BR>"
dat += "<A href='?src=[src.UID()];action=juice'>Juice the reagents</a><BR><BR>"
if(holdingitems && holdingitems.len > 0)
dat += "<A href='?src=\ref[src];action=eject'>Eject the reagents</a><BR>"
dat += "<A href='?src=[src.UID()];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=[src.UID()];action=detach'>Detach the beaker</a><BR>"
else
dat += "Please wait..."