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

Fire Hugging V2 (#15563)

Browse Source
This commit is contained in:
SabreML
2021-02-23 11:55:47 +00:00
committed by GitHub
parent 204d58d06e
commit 29932437b5
3 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien_defense.dm
+4 -1
View File
@@ -42,7 +42,10 @@ In all, this is a lot like the monkey code. /N
switch(M.a_intent)
if(INTENT_HELP)
help_shake_act(M)
if(M.on_fire)
pat_out(M)
else
help_shake_act(M)
if(INTENT_GRAB)
grabbedby(M)
if(INTENT_HARM)
code/modules/mob/living/carbon/carbon.dm
+26 -19
View File
@@ -238,25 +238,6 @@
"<span class='notice'>[M] shakes [src] trying to wake [p_them()] up!</span>",\
"<span class='notice'>You shake [src] trying to wake [p_them()] up!</span>",\
)
else if(on_fire)
var/self_message = "<span class='warning'>You try to extinguish [src]!</span>"
if(prob(30) && ishuman(M)) // 30% chance of burning your hands
var/mob/living/carbon/human/H = M
var/protected = FALSE // Protected from the fire
if((H.gloves?.max_heat_protection_temperature > 360) || HAS_TRAIT(H, TRAIT_RESISTHEAT) || HAS_TRAIT(H, TRAIT_RESISTHEATHANDS))
protected = TRUE
var/obj/item/organ/external/active_hand = H.get_organ("[H.hand ? "l" : "r"]_hand")
if(active_hand && !protected) // Wouldn't really work without a hand
active_hand.receive_damage(0, 5)
self_message = "<span class='danger'>You burn your hand trying to extinguish [src]!</span>"
H.update_icons()
M.visible_message("<span class='warning'>[M] tries to extinguish [src]!</span>", self_message)
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
adjust_fire_stacks(-0.5)
// BEGIN HUGCODE - N3X
else
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
@@ -278,6 +259,32 @@
else if(H.w_uniform)
H.w_uniform.add_fingerprint(M)
/**
* Handles patting out a fire on someone.
*
* Removes 0.5 fire stacks per pat, with a 30% chance of the user burning their hand if they don't have adequate heat resistance.
* Arguments:
* * src - The mob doing the patting
* * target - The mob who is currently on fire
*/
/mob/living/carbon/proc/pat_out(mob/living/target)
var/self_message = "<span class='warning'>You try to extinguish [target]!</span>"
if(prob(30) && ishuman(src)) // 30% chance of burning your hands
var/mob/living/carbon/human/H = src
var/protected = FALSE // Protected from the fire
if((H.gloves?.max_heat_protection_temperature > 360) || HAS_TRAIT(H, TRAIT_RESISTHEAT) || HAS_TRAIT(H, TRAIT_RESISTHEATHANDS))
protected = TRUE
var/obj/item/organ/external/active_hand = H.get_active_hand()
if(active_hand && !protected) // Wouldn't really work without a hand
active_hand.receive_damage(0, 5)
self_message = "<span class='danger'>You burn your hand trying to extinguish [target]!</span>"
H.update_icons()
target.visible_message("<span class='warning'>[src] tries to extinguish [target]!</span>", self_message)
playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
target.adjust_fire_stacks(-0.5)
/mob/living/carbon/proc/check_self_for_injuries()
var/mob/living/carbon/human/H = src
visible_message( \
code/modules/mob/living/carbon/human/species/_species.dm
+3 -1
View File
@@ -387,7 +387,9 @@
/datum/species/proc/help(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(attacker_style && attacker_style.help_act(user, target) == TRUE)//adminfu only...
return TRUE
if(target.health >= HEALTH_THRESHOLD_CRIT && !HAS_TRAIT(target, TRAIT_FAKEDEATH))
if(target.on_fire)
user.pat_out(target)
else if(target.health >= HEALTH_THRESHOLD_CRIT && !HAS_TRAIT(target, TRAIT_FAKEDEATH))
target.help_shake_act(user)
return TRUE
else