shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4826 from deathride58/hopefullyfixesshit

Browse Source 
Hopefully fixes human tails/ears not saving, and fixes new/random characters having underwear
This commit is contained in:
LetterJay
2018-01-16 05:03:05 -06:00
committed by GitHub
parent 5f5347e296 927913662d
commit 59b5956447
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/mobs.dm
+11 -8
View File
@@ -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)
code/modules/mob/living/carbon/human/species_types/humans.dm
+2 -2
View File
@@ -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