From 927913662d141ef36e04698b9135bbd87ecaad52 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 14 Jan 2018 15:25:13 -0500 Subject: [PATCH] hopefully fixes new characters having underwear and fixes human tails/ears not saving --- code/__HELPERS/mobs.dm | 19 +++++++++++-------- .../carbon/human/species_types/humans.dm | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 14092581b8..9d01999847 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -20,32 +20,35 @@ else return "000" -/proc/random_underwear(gender) +/proc/random_underwear(gender)//Cit change - makes random underwear always return nude if(!GLOB.underwear_list.len) init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f) - switch(gender) + return "Nude" + /*switch(gender) if(MALE) return pick(GLOB.underwear_m) if(FEMALE) return pick(GLOB.underwear_f) else - return pick(GLOB.underwear_list) + return pick(GLOB.underwear_list)*/ -/proc/random_undershirt(gender) +/proc/random_undershirt(gender)//Cit change - makes random underwear always return nude if(!GLOB.undershirt_list.len) init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f) - switch(gender) + return "Nude" + /*switch(gender) if(MALE) return pick(GLOB.undershirt_m) if(FEMALE) return pick(GLOB.undershirt_f) else - return pick(GLOB.undershirt_list) + return pick(GLOB.undershirt_list)*/ -/proc/random_socks() +/proc/random_socks()//Cit change - makes random underwear always return nude if(!GLOB.socks_list.len) init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list) - return pick(GLOB.socks_list) + return "Nude" + //return pick(GLOB.socks_list) /proc/random_features() if(!GLOB.tails_list_human.len) diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 31883b4dcd..15758498c8 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -3,8 +3,8 @@ id = "human" default_color = "FFFFFF" species_traits = list(MUTCOLORS_PARTSONLY,SPECIES_ORGANIC,EYECOLOR,HAIR,FACEHAIR,LIPS) - mutant_bodyparts = list("tail_human", "ears", "wings", "taur") - default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None", "taur" = "none") + mutant_bodyparts = list("mam_tail", "mam_ears", "wings", "taur") + default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "wings" = "None", "taur" = "none") use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human disliked_food = GROSS | RAW