cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

515 Compatibility (#19636)

Browse Source 
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
This commit is contained in:
S34N
2022-11-08 23:08:40 +00:00
committed by GitHub
parent 2e7e556383
commit 667dd5d4ac
378 changed files with 928 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/handheld_defib.dm
+5 -5
View File
@@ -52,9 +52,9 @@
ADD_TRAIT(H, TRAIT_WAS_BATONNED, user_UID)
cooldown = TRUE
icon_state = "[icon_base]-shock"
addtimer(CALLBACK(src, .proc/allowhit, H, user_UID), attack_cooldown)
addtimer(CALLBACK(src, .proc/short_charge), 1 SECONDS)
addtimer(CALLBACK(src, .proc/recharge), charge_time)
addtimer(CALLBACK(src, PROC_REF(allowhit), H, user_UID), attack_cooldown)
addtimer(CALLBACK(src, PROC_REF(short_charge)), 1 SECONDS)
addtimer(CALLBACK(src, PROC_REF(recharge)), charge_time)
return
if((H.health <= HEALTH_THRESHOLD_CRIT) || (H.undergoing_cardiac_arrest()))
@@ -84,8 +84,8 @@
cooldown = TRUE
icon_state = "[icon_base]-shock"
addtimer(CALLBACK(src, .proc/short_charge), 1 SECONDS)
addtimer(CALLBACK(src, .proc/recharge), charge_time)
addtimer(CALLBACK(src, PROC_REF(short_charge)), 1 SECONDS)
addtimer(CALLBACK(src, PROC_REF(recharge)), charge_time)
else
to_chat(user, "<span class='notice'>[src]'s on board medical scanner indicates that no shock is required.</span>")