cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Defib unattached brain nerf (#35099)

Browse Source 
* makes defib fail if brain not attached

* removed unnecessary line
This commit is contained in:
gheritt
2023-10-03 12:55:59 -04:00
committed by GitHub
parent f40bd5f750
commit 477acff7be
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/weapons/defib.dm
View File

@@ -159,6 +159,9 @@
if(!target.has_brain()) if(!target.has_brain())
defib_message_fail(target, "<span class='warning'>[src] buzzes: Defibrillation failed. No central nervous system detected.</span>") defib_message_fail(target, "<span class='warning'>[src] buzzes: Defibrillation failed. No central nervous system detected.</span>")
return return
if(!target.has_attached_brain())
defib_message_fail(target, "<span class='warning'>[src] buzzes: Defibrillation failed. Central nervous system detachment detected.</span>")
return
if(target.mind && target.mind.suiciding) if(target.mind && target.mind.suiciding)
defib_message_fail(target, "<span class='warning'>[src] buzzes: Defibrillation failed. Unrecoverable nerve trauma detected.</span>") // They suicided so they fried their brain. Space Magic. defib_message_fail(target, "<span class='warning'>[src] buzzes: Defibrillation failed. Unrecoverable nerve trauma detected.</span>") // They suicided so they fried their brain. Space Magic.
return return

6
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1485,6 +1485,12 @@
if(brain && istype(brain)) if(brain && istype(brain))
return 1 return 1
return 0 return 0
/mob/living/carbon/human/has_attached_brain()
if(internal_organs_by_name["brain"])
var/datum/organ/internal/brain = internal_organs_by_name["brain"]
if(brain && istype(brain) && !(brain.status & ORGAN_CUT_AWAY))
return 1
return 0
/mob/living/carbon/human/has_eyes() /mob/living/carbon/human/has_eyes()
if(internal_organs_by_name["eyes"]) if(internal_organs_by_name["eyes"])
var/datum/organ/internal/eyes = internal_organs_by_name["eyes"] var/datum/organ/internal/eyes = internal_organs_by_name["eyes"]

3
code/modules/mob/living/living.dm
View File

@@ -1220,6 +1220,9 @@ Thanks.
/mob/living/proc/has_brain() /mob/living/proc/has_brain()
return 1 return 1
/mob/living/proc/has_attached_brain()
return 1
/mob/living/proc/has_eyes() /mob/living/proc/has_eyes()
return 1 return 1