mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Cremation animation + refactors and improvements (#10885)
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user