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

Update mobs.dm

Browse Source
This commit is contained in:
deathride58
2018-03-08 01:01:42 -05:00
committed by GitHub
parent e559fdca2c
commit 28f886791d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/mobs.dm
+1 -5
View File
@@ -74,7 +74,6 @@
if(!GLOB.moth_wings_list.len) if(!GLOB.moth_wings_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
<<<<<<< HEAD
//CIT CHANGES - genitals and such //CIT CHANGES - genitals and such
if(!GLOB.cock_shapes_list.len) if(!GLOB.cock_shapes_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
@@ -112,6 +111,7 @@
"spines" = pick(GLOB.spines_list), "spines" = pick(GLOB.spines_list),
"body_markings" = pick(GLOB.body_markings_list), "body_markings" = pick(GLOB.body_markings_list),
"legs" = "Normal Legs", "legs" = "Normal Legs",
"caps" = pick(GLOB.caps_list),
"moth_wings" = pick(GLOB.moth_wings_list), "moth_wings" = pick(GLOB.moth_wings_list),
"taur" = "None", "taur" = "None",
"mam_body_markings" = "None", "mam_body_markings" = "None",
@@ -167,11 +167,7 @@
"womb_efficiency" = CUM_EFFICIENCY, "womb_efficiency" = CUM_EFFICIENCY,
"womb_fluid" = "femcum", "womb_fluid" = "femcum",
"flavor_text" = "")) "flavor_text" = ""))
=======
//For now we will always return none for tail_human and ears.
return(list("mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "tail_lizard" = pick(GLOB.tails_list_lizard), "tail_human" = "None", "wings" = "None", "snout" = pick(GLOB.snouts_list), "horns" = pick(GLOB.horns_list), "ears" = "None", "frills" = pick(GLOB.frills_list), "spines" = pick(GLOB.spines_list), "body_markings" = pick(GLOB.body_markings_list), "legs" = "Normal Legs", "caps" = pick(GLOB.caps_list), "moth_wings" = pick(GLOB.moth_wings_list)))
>>>>>>> 84d4b3a... Mushroom people, revived! (#35858)
/proc/random_hair_style(gender) /proc/random_hair_style(gender)
switch(gender) switch(gender)
if(MALE) if(MALE)