Merge pull request #9070 from Fox-McCloud/plastic-surgery

Adds Plastic Surgery; Fixes Disfigurement
This commit is contained in:
tigercat2000
2018-06-13 13:20:00 -07:00
committed by GitHub
14 changed files with 90 additions and 184 deletions
@@ -115,7 +115,11 @@
M.adjustToxLoss(-3)
M.adjustBruteLoss(-12)
M.adjustFireLoss(-12)
M.status_flags &= ~DISFIGURED
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head = H.get_organ("head")
if(head)
head.disfigured = FALSE
..()
/datum/reagent/medicine/rezadone
@@ -131,7 +135,11 @@
M.adjustCloneLoss(-1) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate.
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
M.status_flags &= ~DISFIGURED
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head = H.get_organ("head")
if(head)
head.disfigured = FALSE
..()
/datum/reagent/medicine/rezadone/overdose_process(mob/living/M, severity)
@@ -611,11 +611,11 @@
return
if(!H.unacidable)
var/obj/item/organ/external/affecting = H.get_organ("head")
affecting.receive_damage(0, 75)
var/obj/item/organ/external/head/affecting = H.get_organ("head")
if(affecting)
affecting.receive_damage(0, 75)
H.UpdateDamageIcon()
H.emote("scream")
H.status_flags |= DISFIGURED
/datum/reagent/facid/reaction_obj(obj/O, volume)
if((istype(O, /obj/item) || istype(O, /obj/structure/glowshroom)))