cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-23 20:56:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'another_copy_just_in_case' into attempt_to_salvage

Browse Source
This commit is contained in:
jack-fractal
2015-07-10 20:39:08 -04:00
parent 8f76c3afae 4333938f35
commit 2f9f3d10ce
3 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+8 -2
View File
@@ -225,7 +225,11 @@
/datum/species/proc/get_organ_preview_icon(var/name, var/robot, var/gendered, var/gender_string, var/datum/preferences/preferences, var/datum/synthetic_limb_cover/covering, var/paint_colour)
var/icon_name = icobase
if (robot)
icon_name = (istype(covering)) ? covering.main_icon : 'icons/mob/human_races/robotic.dmi'
if(istype(covering))
icon_name = covering.main_icon
else
icon_name = 'icons/mob/human_races/robotic.dmi'
paint_colour = null // no paint for bare robots
var/state_name = name
if (gendered)
state_name+="_[gender_string]"
@@ -256,7 +260,8 @@
var/tail_state=null
if (!(isnull(preview_coverings["groin"])))
var/datum/synthetic_limb_cover/covering=preview_coverings["groin"]
tail_state=covering.tail
if(covering.tail)
tail_state="[covering.tail]_s"
if(tail)
tail_state="[tail]_s"
if(tail_state)
@@ -264,6 +269,7 @@
result.Blend(rgb(preferences.r_hair,preferences.g_hair,preferences.b_hair),ICON_ADD)
return result
/datum/species/proc/get_eyes_preview_icon(var/list/preview_coverings,var/datum/preferences/preferences)
var/eye_state=null
if (!(isnull(preview_coverings["head"])))