Merge pull request #5479 from Crazylemon64/fat_fix

You're Fatter.
This commit is contained in:
Fox McCloud
2016-08-18 00:26:36 -04:00
committed by GitHub
4 changed files with 111 additions and 52 deletions
@@ -137,6 +137,36 @@
spawn(10)
qdel(spark_system)
/mob/living/carbon/human/proc/becomeSlim()
to_chat(src, "<span class='notice'>You feel fit again!</span>")
var/obj/item/organ/external/chest/C = get_organ("chest")
if(istype(C))
C.makeSlim(0)
else
to_chat(src, "Err, well, you *would*, but you don't have a torso. Yell at a coder.")
log_debug("[src] at ([x],[y],[z]) doesn't have a torso.")
mutations.Remove(FAT)
update_mutantrace(0)
update_mutations(0)
update_body(0)
update_inv_w_uniform(0)
update_inv_wear_suit()
/mob/living/carbon/human/proc/becomeFat()
to_chat(src, "<span class='alert'>You suddenly feel blubbery!</span>")
var/obj/item/organ/external/chest/C = get_organ("chest")
if(istype(C))
C.makeFat()
else
to_chat(src, "Err, well, you *would*, but you don't have a torso. Yell at a coder.")
log_debug("[src] at ([x],[y],[z]) doesn't have a torso.")
mutations.Add(FAT)
update_mutantrace(0)
update_mutations(0)
update_body(0)
update_inv_w_uniform(0)
update_inv_wear_suit()
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
//New are added for reagents to random organs.
@@ -166,4 +196,4 @@ I use this to standardize shadowling dethrall code
if(!get_int_organ(organ_name))
return null
var/obj/item/organ/internal/O = get_int_organ(organ_name)
return O.parent_organ
return O.parent_organ
+2 -12
View File
@@ -675,20 +675,10 @@
if(species.flags & CAN_BE_FAT)
if(FAT in mutations)
if(overeatduration < 100)
to_chat(src, "<span class='notice'>You feel fit again!</span>")
mutations.Remove(FAT)
update_mutantrace(0)
update_mutations(0)
update_inv_w_uniform(0)
update_inv_wear_suit()
becomeSlim()
else
if(overeatduration > 500)
to_chat(src, "<span class='alert'>You suddenly feel blubbery!</span>")
mutations.Add(FAT)
update_mutantrace(0)
update_mutations(0)
update_inv_w_uniform(0)
update_inv_wear_suit()
becomeFat()
// nutrition decrease
if(nutrition > 0 && stat != 2)