cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors most spans into span procs (#6315)

Browse Source 
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-16 00:24:49 +01:00
committed by GitHub
co-authored by Watermelon914 Gandalf
parent cd5dba4fbd
commit 7d1d0e1fad
1676 changed files with 15455 additions and 15211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/timer.dm
+3 -3
View File
@@ -14,13 +14,13 @@
var/hearing_range = 3
/obj/item/assembly/timer/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!</span>")
user.visible_message(span_suicide("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!"))
activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...)
addtimer(CALLBACK(src, .proc/manual_suicide, user), time SECONDS)//kill yourself once the time runs out
return MANUAL_SUICIDE
/obj/item/assembly/timer/proc/manual_suicide(mob/living/user)
user.visible_message("<span class='suicide'>[user]'s time is up!</span>")
user.visible_message(span_suicide("[user]'s time is up!"))
user.adjustOxyLoss(200)
user.death(0)
@@ -34,7 +34,7 @@
/obj/item/assembly/timer/examine(mob/user)
. = ..()
. += "<span class='notice'>The timer is [timing ? "counting down from [time]":"set for [time] seconds"].</span>"
. += span_notice("The timer is [timing ? "counting down from [time]":"set for [time] seconds"].")
/obj/item/assembly/timer/activate()
if(!..())