mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #4264 from Anewbe/decap_defib
Decapitation now stops defibrillation
This commit is contained in:
@@ -15,6 +15,8 @@
|
||||
var/spit_name = null //String
|
||||
var/last_spit = 0 //Timestamp.
|
||||
|
||||
var/can_defib = 1 //Horrible damage (like beheadings) will prevent defibbing organics.
|
||||
|
||||
/mob/living/carbon/human/New(var/new_loc, var/new_species = null)
|
||||
|
||||
if(!dna)
|
||||
|
||||
@@ -279,6 +279,8 @@
|
||||
spawn(1)
|
||||
owner.update_hair()
|
||||
get_icon()
|
||||
if(vital) //This is just in case we ever add something that both a) Doesn't need a head to live, and b) Can be defibbed
|
||||
owner.can_defib = 0
|
||||
..()
|
||||
|
||||
/obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())
|
||||
|
||||
Reference in New Issue
Block a user