This commit is contained in:
Fox McCloud
2018-05-27 14:15:14 -04:00
parent e5856c842a
commit e9c4568c4f
10 changed files with 16 additions and 37 deletions
+1 -1
View File
@@ -161,7 +161,7 @@
var/obj/item/organ/external/head/head = C.get_organ("head")
if(head)
C.apply_damage(30, BURN, "head") //30 fire damage because it's FUCKING LAVA
head.disfigure("burn") //Your face is unrecognizable because it's FUCKING LAVA
head.disfigure() //Your face is unrecognizable because it's FUCKING LAVA
return 1
else
..()
@@ -58,7 +58,7 @@
C.emote("scream")
user.changeNext_move(CLICK_CD_MELEE)
C.apply_damage(25, BURN, "head") //25 fire damage and disfigurement because your face was just deep fried!
head.disfigure("burn")
head.disfigure()
add_attack_logs(user, G.affecting, "Deep-fried with [src]")
qdel(G) //Removes the grip so the person MIGHT have a small chance to run the fuck away and to prevent rapid dunks.
return 0
@@ -513,7 +513,7 @@
//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable
/mob/living/carbon/human/proc/get_face_name()
var/obj/item/organ/external/head = get_organ("head")
if( !head || head.disfigured || !real_name || (HUSK in mutations) ) //disfigured. use id-name if possible
if(!head || head.disfigured || cloneloss > 50 || !real_name || (HUSK in mutations)) //disfigured. use id-name if possible
return "Unknown"
return real_name
@@ -118,10 +118,8 @@
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)
if(head)
head.disfigured = FALSE
head.update_icon()
H.regenerate_icons()
..()
/datum/reagent/medicine/rezadone
@@ -140,10 +138,8 @@
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)
if(head)
head.disfigured = FALSE
head.update_icon()
H.regenerate_icons()
..()
/datum/reagent/medicine/rezadone/overdose_process(mob/living/M, severity)
@@ -614,10 +614,7 @@
var/obj/item/organ/external/head/affecting = H.get_organ("head")
if(affecting)
affecting.receive_damage(0, 75)
if(!affecting.disfigured)
affecting.disfigured = TRUE
affecting.update_icon()
H.regenerate_icons()
affecting.disfigure()
H.UpdateDamageIcon()
H.emote("scream")
+1 -1
View File
@@ -136,7 +136,7 @@
"<span class='warning'>Your hand slips, damaging [target]'s face with \the [tool]!</span>")
var/obj/item/organ/external/head/h = affected
h.receive_damage(10)
h.disfigured = 1
h.disfigure()
return 0
/datum/surgery_step/finish_bone
+6 -12
View File
@@ -273,8 +273,7 @@ This function completely restores a damaged organ to perfect condition.
burn_dam = 0
open = 0 //Closing all wounds.
internal_bleeding = FALSE
if(istype(src, /obj/item/organ/external/head) && disfigured) //If their head's disfigured, refigure it.
disfigured = 0
disfigured = FALSE
// handle internal organs
for(var/obj/item/organ/internal/current_organ in internal_organs)
@@ -737,19 +736,14 @@ Note that amputating the affected organ does in fact remove the infection from t
qdel(spark_system)
qdel(src)
/obj/item/organ/external/proc/disfigure(var/type = "brute")
/obj/item/organ/external/proc/disfigure()
if(disfigured)
return
if(owner)
if(type == "brute")
owner.visible_message("<span class='warning'>You hear a sickening cracking sound coming from \the [owner]'s [name].</span>", \
"<span class='danger'>Your [name] becomes a mangled mess!</span>", \
"<span class='warning'>You hear a sickening crack.</span>")
else
owner.visible_message("<span class='warning'>\The [owner]'s [name] melts away, turning into mangled mess!</span>", \
"<span class='danger'>Your [name] melts away!</span>", \
"<span class='warning'>You hear a sickening sizzle.</span>")
disfigured = 1
owner.visible_message("<span class='warning'>You hear a sickening sound coming from \the [owner]'s [name] as it turns into a mangled mess!</span>", \
"<span class='danger'>Your [name] becomes a mangled mess!</span>", \
"<span class='warning'>You hear a sickening sound.</span>")
disfigured = TRUE
/obj/item/organ/external/is_primary_organ(var/mob/living/carbon/human/O = null)
if(isnull(O))
@@ -211,11 +211,8 @@
/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
..(brute, burn, sharp, used_weapon, forbidden_limbs, ignore_resists)
if(!disfigured)
if(brute_dam > 40)
if(prob(50))
disfigure("brute")
if(burn_dam > 40)
disfigure("burn")
if(brute_dam + burn_dam > 50)
disfigure()
/obj/item/organ/external/head/proc/handle_alt_icon()
if(alt_head && alt_heads_list[alt_head])
-2
View File
@@ -27,8 +27,6 @@
var/species_names = target.get_species()
if(head.disfigured)
head.disfigured = FALSE
head.update_icon()
target.regenerate_icons()
user.visible_message("[user] successfully restores [target]'s appearance!", "<span class='notice'>You successfully restore [target]'s appearance.</span>")
else
var/list/names = list()
+1 -4
View File
@@ -248,10 +248,7 @@
user.visible_message("<span class='notice'> [user] finishes patching damage to [target]'s [affected.name] with \the [tool].</span>", \
"<span class='notice'> You finish patching damage to [target]'s [affected.name] with \the [tool].</span>")
affected.heal_damage(rand(30,50),0,1,1)
if(affected.disfigured)
affected.disfigured = 0
affected.update_icon()
target.regenerate_icons()
affected.disfigured = FALSE
if("burn")
user.visible_message("<span class='notice'> [user] finishes splicing cable into [target]'s [affected.name].</span>", \
"<span class='notice'> You finishes splicing new cable into [target]'s [affected.name].</span>")