cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Fat Sprites (#13430)

Browse Source 
* Removes Fat Sprites

* fat vs chubby

* edge case
This commit is contained in:
Fox McCloud
2020-05-23 03:10:39 -06:00
committed by GitHub
parent 707258f78c
commit 798cf7a8be
45 changed files with 46 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+6 -3
View File
@@ -292,11 +292,14 @@
if(nutrition < NUTRITION_LEVEL_HYPOGLYCEMIA)
msg += "[p_they(TRUE)] [p_are()] severely malnourished.\n"
else if(nutrition >= NUTRITION_LEVEL_FAT)
if(FAT in mutations)
msg += "[p_they(TRUE)] [p_are()] morbidly obese.\n"
if(user.nutrition < NUTRITION_LEVEL_HYPOGLYCEMIA)
msg += "[p_they(TRUE)] [p_are()] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
else
msg += "[p_they(TRUE)] [p_are()] quite chubby.\n"
else if(nutrition >= NUTRITION_LEVEL_FAT)
msg += "[p_they(TRUE)] [p_are()] quite chubby.\n"
if(!isSynthetic() && blood_volume < BLOOD_VOLUME_SAFE)
msg += "[p_they(TRUE)] [p_have()] pale skin.\n"
code/modules/mob/living/carbon/human/human_organs.dm
-22
View File
@@ -111,33 +111,11 @@
/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, 1)
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, 1)
update_inv_w_uniform(0)
update_inv_wear_suit()
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
code/modules/mob/living/carbon/human/life.dm
+6 -8
View File
@@ -598,14 +598,12 @@
return 0 //godmode
if(!(NO_HUNGER in dna.species.species_traits))
//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
if(CAN_BE_FAT in dna.species.species_traits)
if(FAT in mutations)
if(overeatduration < 100)
becomeSlim()
else
if(overeatduration > 500)
becomeFat()
if(FAT in mutations)
if(overeatduration < 100)
becomeSlim()
else
if(overeatduration > 500)
becomeFat()
// nutrition decrease
if(nutrition > 0 && stat != DEAD)
code/modules/mob/living/carbon/human/species/_species.dm
-7
View File
@@ -616,13 +616,6 @@
if(!H.has_organ_for_slot(slot))
return FALSE
if(istype(I, /obj/item/clothing/under) || istype(I, /obj/item/clothing/suit))
if(FAT in H.mutations)
if(!(I.flags_size & ONESIZEFITSALL))
if(!disable_warning)
to_chat(H, "<span class='alert'>You're too fat to wear the [I].</span>")
return FALSE
switch(slot)
if(slot_l_hand)
return !H.l_hand && !H.incapacitated()
code/modules/mob/living/carbon/human/species/grey.dm
+1 -1
View File
@@ -21,7 +21,7 @@
default_genes = list(REMOTE_TALK)
species_traits = list(LIPS, IS_WHITELISTED, CAN_BE_FAT, CAN_WINGDINGS)
species_traits = list(LIPS, IS_WHITELISTED, CAN_WINGDINGS)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_BODY_MARKINGS
dietflags = DIET_HERB
code/modules/mob/living/carbon/human/species/human.dm
+2 -2
View File
@@ -5,7 +5,7 @@
deform = 'icons/mob/human_races/r_def_human.dmi'
primitive_form = /datum/species/monkey
language = "Sol Common"
species_traits = list(LIPS, CAN_BE_FAT)
species_traits = list(LIPS)
skinned_type = /obj/item/stack/sheet/animalhide/human
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS
@@ -18,4 +18,4 @@
reagent_tag = PROCESS_ORG
//Has standard darksight of 2.
code/modules/mob/living/carbon/human/species/tajaran.dm
+1 -1
View File
@@ -24,7 +24,7 @@
primitive_form = /datum/species/monkey/tajaran
species_traits = list(LIPS, CAN_BE_FAT)
species_traits = list(LIPS)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING
dietflags = DIET_OMNI
code/modules/mob/living/carbon/human/update_icons.dm
+7 -26
View File
@@ -1,8 +1,8 @@
/*
Global associative list for caching humanoid icons.
Index format m or f, followed by a string of 0 and 1 to represent bodyparts followed by husk fat hulk skeleton 1 or 0.
Index format m or f, followed by a string of 0 and 1 to represent bodyparts followed by husk hulk skeleton 1 or 0.
TODO: Proper documentation
icon_key is [species.race_key][g][husk][fat][hulk][skeleton][s_tone]
icon_key is [species.race_key][g][husk][hulk][skeleton][s_tone]
*/
GLOBAL_LIST_EMPTY(human_icon_cache)
@@ -449,10 +449,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_mutations(var/update_icons=1)
remove_overlay(MUTATIONS_LAYER)
var/fat
if(FAT in mutations)
fat = "fat"
var/mutable_appearance/standing = mutable_appearance('icons/effects/genetics.dmi', layer = -MUTATIONS_LAYER)
var/add_image = 0
var/g = "m"
@@ -463,7 +459,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(!gene.block)
continue
if(gene.is_active(src))
var/underlay = gene.OnDrawUnderlays(src, g, fat)
var/underlay = gene.OnDrawUnderlays(src, g)
if(underlay)
standing.underlays += underlay
add_image = 1
@@ -473,9 +469,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
standing.overlays += "lasereyes_s"
add_image = 1
if((COLDRES in mutations) && (HEATRES in mutations))
standing.underlays -= "cold[fat]_s"
standing.underlays -= "fire[fat]_s"
standing.underlays += "coldfire[fat]_s"
standing.underlays -= "cold_s"
standing.underlays -= "fire_s"
standing.underlays += "coldfire_s"
if(add_image)
overlays_standing[MUTATIONS_LAYER] = standing
@@ -557,13 +553,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
t_color = icon_state
var/mutable_appearance/standing = mutable_appearance('icons/mob/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER)
if(FAT in mutations)
if(w_uniform.flags_size & ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
else
to_chat(src, "<span class='warning'>You burst out of \the [w_uniform]!</span>")
unEquip(w_uniform)
return
if(w_uniform.icon_override)
standing.icon = w_uniform.icon_override
@@ -873,13 +862,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
standing = mutable_appearance(wear_suit.icon_override, "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name])
standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.name], "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else if(FAT in mutations)
if(wear_suit.flags_size & ONESIZEFITSALL)
standing = mutable_appearance('icons/mob/suit_fat.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else
to_chat(src, "<span class='warning'>You burst out of \the [wear_suit]!</span>")
unEquip(wear_suit)
return
else
standing = mutable_appearance('icons/mob/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER)
@@ -1313,7 +1295,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/proc/generate_icon_render_key()
var/husk = (HUSK in mutations)
var/fat = (FAT in mutations)
var/hulk = (HULK in mutations)
var/skeleton = (SKELETON in mutations)
@@ -1346,4 +1327,4 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(part.s_tone)
. += "[part.s_tone]"
. = "[.][!!husk][!!fat][!!hulk][!!skeleton]"
. = "[.][!!husk][!!hulk][!!skeleton]"
code/modules/mob/mob.dm
-2
View File
@@ -414,8 +414,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
if((FAT in H.mutations) && !(flags_size & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(!(H.w_uniform.flags & NODROP))
return 2
code/modules/mob/new_player/preferences_setup.dm
+1 -6
View File
@@ -237,10 +237,7 @@
else
icobase = 'icons/mob/human_races/r_human.dmi'
var/fat=""
if(disabilities & DISABILITY_FLAG_FAT && (CAN_BE_FAT in current_species.species_traits))
fat="_fat"
preview_icon = new /icon(icobase, "torso_[g][fat]")
preview_icon = new /icon(icobase, "torso_[g]")
preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
var/head = "head"
if(alt_head && current_species.bodyflags & HAS_ALT_HEADS)
@@ -404,8 +401,6 @@
var/icon/clothes_s = null
var/uniform_dmi='icons/mob/uniform.dmi'
if(disabilities&DISABILITY_FLAG_FAT)
uniform_dmi='icons/mob/uniform_fat.dmi'
if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
clothes_s = new /icon(uniform_dmi, "grey_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)