few fixes

This commit is contained in:
Seris02
2019-12-30 11:49:16 +08:00
parent a39c0249c4
commit 40730b48d5
3 changed files with 26 additions and 6 deletions
+1 -1
View File
@@ -1263,7 +1263,7 @@
/obj/item/storage/box/marshmallow
name = "box of marshmallows"
desc = "A box of marshmallows."
icon_state = "marshmallowbox"
illustration = "marshmallow"
/obj/item/storage/box/marshmallow/PopulateContents()
for (var/i in 1 to 5)
@@ -620,6 +620,7 @@
w_class = WEIGHT_CLASS_TINY
tastes = list("marshmallow" = 2)
foodtype = SUGAR | JUNKFOOD
var/burned = 0
/obj/item/reagent_containers/food/snacks/marshmallow/attackby(obj/item/I, mob/user)
switch (I.get_temperature())
@@ -638,14 +639,33 @@
burnmallow(TRUE)
if (3000 to INFINITY)
burnmallow(TRUE)
..()
return ..()
/obj/item/reagent_containers/food/snacks/marshmallow/proc/burnmallow(reallyburned = FALSE)
if (reallyburned && icon_state != "marshmallowrburned")
if (reallyburned && burned == 1)
icon_state = "marshmallowrburned"
desc = "[initial(desc)] It looks very burned."
tastes = list("charcoal" = 2)
else if (icon_state != "marshmallowrburned")
else if (burned == 0)
icon_state = "marshmallowburned"
desc = "[initial(desc)] It looks just right for eating!"
tastes = list("marshmallow" = 1, "cream" = 1)
/obj/item/reagent_containers/food/snacks/marshmallow/fire_act(temp,volume)
switch (temp)
if (355 to 1500)
if (prob(30))
burnmallow()
if (1500 to 2000)
if (prob(50))
burnmallow()
else
burnmallow(TRUE)
if (2000 to 3000)
if (prob(10))
burnmallow()
else
burnmallow(TRUE)
if (3000 to 7000)
burnmallow(TRUE)
if (7000 to INFINITY)
burn()
..()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB