Skip to content

Commit

Permalink
Makes no-heal challenge less of a pain for medbay (#3433)
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy authored Sep 20, 2024
1 parent 0040e95 commit 8a646c9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/game/objects/items/devices/scanners/health_analyzer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@
else
render_list += "<span class='alert ml-1'>Subject has been husked.</span>\n"

// monkestation edit: no-heal challenge
if(HAS_TRAIT(target, TRAIT_NO_HEALS))
render_list += "<span class='alert ml-1'><b>Subject cannot be healed by any known methods.</b></span>\n"
// monkestation end

if(target.stamina.loss)
if(advanced)
render_list += "<span class='alert ml-1'>Fatigue level: [target.stamina.loss]%.</span>\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,15 @@
radio.talk_into(src, msg, radio_channel)
return

// monkestation start: kick no-healers out
if(HAS_TRAIT(mob_occupant, TRAIT_NO_HEALS))
playsound(src, 'sound/machines/cryo_warning.ogg', volume)
radio.talk_into(src, "Patient is unable to be healed, ejecting.", radio_channel)
set_on(FALSE)
open_machine()
return
// monkerstation end

patient_dead = FALSE

if(mob_occupant.get_organic_health() >= mob_occupant.getMaxHealth()) // Don't bother with fully healed people.
Expand Down
4 changes: 4 additions & 0 deletions monkestation/code/modules/surgery/healing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/surgery/healing/can_start(mob/user, mob/living/patient)
if(HAS_TRAIT(patient, TRAIT_NO_HEALS))
return FALSE
return ..()
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7863,6 +7863,7 @@
#include "monkestation\code\modules\storytellers\storytellers\vote.dm"
#include "monkestation\code\modules\storytellers\storytellers\warrior.dm"
#include "monkestation\code\modules\surgery\blood_filter.dm"
#include "monkestation\code\modules\surgery\healing.dm"
#include "monkestation\code\modules\surgery\nif_debonding.dm"
#include "monkestation\code\modules\surgery\advanced\brainwashing.dm"
#include "monkestation\code\modules\surgery\bodyparts\arachnid_bodyparts.dm"
Expand Down

0 comments on commit 8a646c9

Please sign in to comment.