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
+3 -3
View File
@@ -248,7 +248,7 @@
if ((world.time - last_shake) > 5 SECONDS)
playsound(loc, "sound/items/[pick("rip1","rip2")].ogg", 100, 1)
animate_shake()
shake_animation()
last_shake = world.time
if (!req_breakout())
@@ -274,11 +274,11 @@
return
breakout = FALSE
to_chat(escapee, "<span class='warning'>You successfully break out! Tearing the bubble's walls!</span>")
to_chat(escapee, "<span class='warning'>You successfully break out! Tearing the bubble's walls!</span>") // holy shit this is hilarious
visible_message("<span class='danger'>\the [escapee] successfully broke out of \the [src]! Tearing the bubble's walls!</span>")
playsound(loc, "sound/items/[pick("rip1","rip2")].ogg", 100, 1)
break_open()
animate_shake()
shake_animation()
desc += " <span class='danger'>It has hole in it! Maybe you shouldn't use it!</span>"
// We are out finally, the bubble is ripped. So dump everything out from it. Especially air and user.
@@ -202,7 +202,7 @@ var/list/tape_roll_applications = list()
if(user.a_intent == I_HELP)
lifted = !lifted
user.visible_message("<b>[user]</b> [lifted ? "lifts" : "drops"] the [initial(name)], [lifted ? "allowing" : "blocking"] passage.", SPAN_NOTICE("You [lifted ? "lift" : "drop"] the [initial(name)], [lifted ? "allowing" : "blocking"] passage."))
var/shake_time = animate_shake()
var/shake_time = shake_animation()
sleep(shake_time)
if(!allowed(user))
crumple(user)
@@ -239,4 +239,4 @@ var/list/tape_roll_applications = list()
qdel(P)
cur = get_step(cur,dir[i])
qdel(src)
qdel(src)
@@ -75,7 +75,7 @@
L.visible_message("<span class='danger'>[L] tears open the [src], spilling its contents everywhere!</span>", "<span class='danger'>You tear open the [src], spilling its contents everywhere!</span>")
spill()
else
animate_shake()
shake_animation()
var/toplay = pick(list('sound/effects/creatures/nibble1.ogg','sound/effects/creatures/nibble2.ogg'))
playsound(loc, toplay, 30, 1)
damage(damage)
@@ -248,7 +248,7 @@ Frequency:
else
target_closet.visible_message(SPAN_WARNING("\The [target_closet] rattles."))
to_chat(user, SPAN_NOTICE("You teleport into the target closet, bumping into the closed door."))
target_closet.animate_shake()
target_closet.shake_animation()
playsound(get_turf(src), 'sound/effects/grillehit.ogg', 100, TRUE)
/obj/item/closet_teleporter/Destroy()
+4 -5
View File
@@ -146,7 +146,7 @@
anchored = FALSE
deployed = FALSE
update_icon()
animate_shake()
shake_animation()
..()
@@ -236,7 +236,7 @@
buckle_mob(L)
playsound(src, 'sound/weapons/beartrap_shut.ogg', 100, 1)
deployed = FALSE
src.animate_shake()
src.shake_animation()
update_icon()
/obj/item/trap/animal/proc/req_breakout()
@@ -252,7 +252,7 @@
if ((world.time - last_shake) > 5 SECONDS)
playsound(loc, "sound/effects/grillehit.ogg", 100, 1)
animate_shake()
shake_animation()
last_shake = world.time
return TRUE
@@ -372,7 +372,7 @@
unbuckle_mob()
captured = null
visible_message(msg)
animate_shake()
shake_animation()
update_icon()
release_time = world.time
@@ -661,4 +661,3 @@
return
else
..()