cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5508

Browse Source
This commit is contained in:
Zuhayr
2014-07-14 12:16:02 +09:30
parent bc2f91b4e4
commit d8ff5d8ac6
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/human/death.dm
View File

@@ -58,7 +58,6 @@
dizziness = 0 dizziness = 0
jitteriness = 0 jitteriness = 0
hud_updateflag |= 1 << HEALTH_HUD hud_updateflag |= 1 << HEALTH_HUD
hud_updateflag |= 1 << STATUS_HUD hud_updateflag |= 1 << STATUS_HUD
@@ -117,8 +116,6 @@
ticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now ticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
return ..(gibbed) return ..(gibbed)
/mob/living/carbon/human/proc/makeSkeleton() /mob/living/carbon/human/proc/makeSkeleton()
if(SKELETON in src.mutations) return if(SKELETON in src.mutations) return

8
code/modules/organs/organ_external.dm
View File

@@ -32,6 +32,7 @@
var/damage_msg = "\red You feel an intense pain" var/damage_msg = "\red You feel an intense pain"
var/broken_description var/broken_description
var/vital //Lose a vital limb, die immediately.
var/status = 0 var/status = 0
var/open = 0 var/open = 0
var/stage = 0 var/stage = 0
@@ -666,6 +667,9 @@ Note that amputating the affected organ does in fact remove the infection from t
// OK so maybe your limb just flew off, but if it was attached to a pair of cuffs then hooray! Freedom! // OK so maybe your limb just flew off, but if it was attached to a pair of cuffs then hooray! Freedom!
release_restraints() release_restraints()
if(vital)
owner.death()
/**************************************************** /****************************************************
HELPERS HELPERS
****************************************************/ ****************************************************/
@@ -829,7 +833,7 @@ Note that amputating the affected organ does in fact remove the infection from t
max_damage = 75 max_damage = 75
min_broken_damage = 40 min_broken_damage = 40
body_part = UPPER_TORSO body_part = UPPER_TORSO
vital = 1
/datum/organ/external/groin /datum/organ/external/groin
name = "groin" name = "groin"
@@ -838,6 +842,7 @@ Note that amputating the affected organ does in fact remove the infection from t
max_damage = 50 max_damage = 50
min_broken_damage = 30 min_broken_damage = 30
body_part = LOWER_TORSO body_part = LOWER_TORSO
vital = 1
/datum/organ/external/l_arm /datum/organ/external/l_arm
name = "l_arm" name = "l_arm"
@@ -931,6 +936,7 @@ Note that amputating the affected organ does in fact remove the infection from t
min_broken_damage = 40 min_broken_damage = 40
body_part = HEAD body_part = HEAD
var/disfigured = 0 var/disfigured = 0
vital = 1
/datum/organ/external/head/get_icon() /datum/organ/external/head/get_icon()
if (!owner) if (!owner)