Cremation animation + refactors and improvements (#10885)

This commit is contained in:
Wowzewow (Wezzy)
2021-02-01 10:22:15 +01:00
committed by GitHub
parent cc50f53ecf
commit 2107f3d20a
24 changed files with 242 additions and 269 deletions
+1 -1
View File
@@ -114,7 +114,7 @@
//-------------------------------
/datum/wifi/receiver/button/crematorium/activate(mob/living/user)
..()
var/obj/structure/crematorium/C = parent
var/obj/structure/morgue/crematorium/C = parent
if(istype(C))
C.cremate(user)
+1 -1
View File
@@ -712,7 +712,7 @@ var/list/worths = list(
/obj/structure/kitchenspike = 35,
/obj/structure/lattice = 1,
/obj/structure/morgue = 100,
/obj/structure/crematorium = 600,
/obj/structure/morgue/crematorium = 600,
/obj/structure/device/piano = 1200, //pianos are expensive,
/obj/structure/noticeboard = 15,
/obj/structure/safe/floor = 180,
+1 -1
View File
@@ -1235,7 +1235,7 @@ Note that amputating the affected organ does in fact remove the infection from t
"<span class='danger'>Your [name] becomes a mangled mess!</span>", \
"<span class='warning'>You hear a sickening crack.</span>")
else
owner.visible_message("<span class='warning'>\The [owner]'s [name] melts away, turning into mangled mess!</span>", \
owner.visible_message("<span class='warning'>\The [owner]'s [name] melts away, turning into a mangled mess!</span>", \
"<span class='danger'>Your [name] melts away!</span>", \
"<span class='warning'>You hear a sickening sizzle.</span>")
disfigured = 1
@@ -390,7 +390,7 @@
reagents.trans_to_mob(user, m_bitesize, CHEM_INGEST)
bitecount++
animate_shake()
shake_animation()
playsound(loc, pick('sound/effects/creatures/nibble1.ogg','sound/effects/creatures/nibble2.ogg'), 30, 1)
on_consume(user, user) //mob is both user and target for on_consume since it is feeding itself in this instance