cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

burn wounds, for real this time (#20542)

Browse Source 
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

* Update code/game/objects/items/devices/scanners.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
This commit is contained in:
Charlie
2023-04-14 15:58:38 +02:00
committed by GitHub
co-authored by Farie82 Nathan Winters
parent 7293b7ecbd
commit e6085895c1
22 changed files with 107 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/medical_packs.dm
+14
View File
@@ -111,6 +111,7 @@
remburn = nremburn
user.visible_message("<span class='green'>[user] [healverb]s the wounds on [H]'s [E.name] with the remaining medication.</span>", \
"<span class='green'>You [healverb] the wounds on [H]'s [E.name] with the remaining medication.</span>" )
return affecting
//Bruise Packs//
@@ -220,6 +221,19 @@
else
to_chat(user, "<span class='warning'>[affecting] is cut open, you'll need more than some ointment!</span>")
/obj/item/stack/medical/ointment/heal(mob/living/M, mob/user)
var/obj/item/organ/external/affecting = ..()
if((affecting.status & ORGAN_BURNT) && !(affecting.status & ORGAN_SALVED))
affecting.status |= ORGAN_SALVED
addtimer(CALLBACK(affecting, TYPE_PROC_REF(/obj/item/organ/external, remove_ointment), heal_burn), 3 MINUTES)
/obj/item/organ/external/proc/remove_ointment(heal_amount) //de-ointmenterized D:
status &= ~ORGAN_SALVED
perma_injury = max(perma_injury - heal_amount, 0)
if(owner)
owner.updatehealth("permanent injury removal")
if(!perma_injury)
fix_burn_wound(update_health = FALSE)
/obj/item/stack/medical/ointment/advanced
name = "advanced burn kit"