cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-29 15:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into upstream-merge

Browse Source
This commit is contained in:
BongaTheProto
2024-04-06 19:06:12 -05:00
parent dc057a41ad c2df4281b9
commit 2709ec887c
9 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/modules/mob/living/living.dm
+11 -11
View File
@@ -35,26 +35,26 @@
if(1.21 to INFINITY)
mob_size = MOB_SIZE_LARGE
//It's here so it doesn't make a big mess on randomverbs.dm,
//also because of this you can proccall it, why would you if you have smite?
// It's here so it doesn't make a big mess on randomverbs.dm,
// also because of this you can proccall it, why would you if you have smite?
// This code was bad. For future reference, stoplag() and sleep() are very different and not at all interchangeable.
// You can also use animate() to cleanly animate variables like alpha.
// Finally, NEVER call Destroy() directly.
/mob/living/proc/goodbye(C)
/mob/living/proc/goodbye()
set waitfor = FALSE
if(isanimal(C))
var/mob/living/simple_animal/D = C
D.toggle_ai(AI_OFF)
AllImmobility(900, TRUE, TRUE) // Complete 15 minutes of stun, hopefully they shouldn't take that long
playsound(C, "modular_sand/sound/effects/admin_punish/changetheworld.ogg", 100, FALSE)
if(isanimal(src))
var/mob/living/simple_animal/simple_animal = src
simple_animal.toggle_ai(AI_OFF)
AllImmobility(INFINITY, TRUE, TRUE)
playsound(src, "modular_sand/sound/effects/admin_punish/changetheworld.ogg", 100, FALSE)
say("Change the world")
sleep(20)
playsound(C, "modular_sand/sound/effects/admin_punish/myfinalmessage.ogg", 100, FALSE)
playsound(src, "modular_sand/sound/effects/admin_punish/myfinalmessage.ogg", 100, FALSE)
say("My final message")
sleep(20)
playsound(C, "modular_sand/sound/effects/admin_punish/goodbye.ogg", 100, FALSE)
playsound(src, "modular_sand/sound/effects/admin_punish/goodbye.ogg", 100, FALSE)
say("Goodbye.")
sleep(20)
playsound(C, "modular_sand/sound/effects/admin_punish/endjingle.ogg", 100, FALSE)
playsound(src, "modular_sand/sound/effects/admin_punish/endjingle.ogg", 100, FALSE)
animate(src, alpha = 10, 3.5 SECONDS)
QDEL_IN(src, 2)