cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks some nuclear agent items (#22119)

Browse Source 
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-09-07 10:52:48 +01:00
committed by GitHub
co-authored by Henri215
parent 56ff3f3720
commit db1ed68a7d
5 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/defibrillator.dm
+31 -6
View File
@@ -92,9 +92,9 @@
if(user && !robotic)
to_chat(user, "<span class='warning'>You silently [safety ? "disable" : "enable"] [unit]'s safety protocols with the card.")
/datum/component/defib/proc/set_cooldown()
/datum/component/defib/proc/set_cooldown(how_short)
on_cooldown = TRUE
addtimer(CALLBACK(src, PROC_REF(end_cooldown)), cooldown)
addtimer(CALLBACK(src, PROC_REF(end_cooldown)), how_short)
/datum/component/defib/proc/end_cooldown()
on_cooldown = FALSE
@@ -151,6 +151,12 @@
to_chat(user, "<span class='notice'>The instructions on [defib_ref] don't mention how to defibrillate that...</span>")
return
if(should_cause_harm && combat && heart_attack_chance == 100)
combat_fibrillate(user, target)
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, TRUE)
busy = FALSE
return
if(should_cause_harm)
fibrillate(user, target)
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, TRUE)
@@ -212,7 +218,7 @@
target.set_heartattack(FALSE)
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK, 100)
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, TRUE)
set_cooldown()
set_cooldown(cooldown)
user.visible_message("<span class='boldnotice'>[defib_ref] pings: Cardiac arrhythmia corrected.</span>")
target.visible_message("<span class='warning'>[target]'s body convulses a bit.</span>", "<span class='userdanger'>You feel a jolt, and your heartbeat seems to steady.</span>")
playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, 1, -1)
@@ -304,7 +310,7 @@
add_attack_logs(user, target, "Revived with [defib_ref]")
SSblackbox.record_feedback("tally", "players_revived", 1, "defibrillator")
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, defib_success)
set_cooldown()
set_cooldown(cooldown)
busy = FALSE
/**
@@ -328,9 +334,28 @@
target.set_heartattack(TRUE)
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK, 100)
add_attack_logs(user, target, "Stunned with [parent]")
set_cooldown()
set_cooldown(cooldown)
busy = FALSE
return
/datum/component/defib/proc/combat_fibrillate(mob/user, mob/living/carbon/human/target)
if(!istype(target))
return
busy = TRUE
target.adjustStaminaLoss(60)
target.emote("gasp")
add_attack_logs(user, target, "Stunned with [parent]")
target.KnockDown(4 SECONDS)
if(IS_HORIZONTAL(target) && HAS_TRAIT(target, TRAIT_HANDS_BLOCKED)) // Weakening exists which doesn't floor you while stunned
add_attack_logs(user, target, "Gave a heart attack with [parent]")
target.set_heartattack(TRUE)
target.visible_message("<span class='danger'>[user] has touched [target] with [parent]!</span>", \
"<span class='userdanger'>[user] touches you with [parent], and you feel a strong jolt!</span>")
playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK, 100)
set_cooldown(cooldown)
return
target.visible_message("<span class='danger'>[user] touches [target] lightly with [parent]!</span>")
set_cooldown(2.5 SECONDS)
/*
* Pass excess shock from a defibrillation into someone else.