From e9a36f4d5389fb7f0a5832f7cc34582e525b5b80 Mon Sep 17 00:00:00 2001 From: MrPerson Date: Wed, 18 Mar 2015 02:21:56 -0700 Subject: [PATCH 1/2] Fixes character appearances - no more bald albinos Fixes #8383 Also removed two defunct comments. --- code/modules/admin/create_mob.dm | 4 +++- code/modules/client/preferences.dm | 13 ++++--------- .../modules/mob/living/carbon/human/update_icons.dm | 6 ------ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 656f0adfb7c..1b1de26a255 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -21,4 +21,6 @@ H.facial_hair_color = H.hair_color H.eye_color = random_eye_color() H.dna.blood_type = random_blood_type() - H.update_icons() \ No newline at end of file + H.update_body() + H.update_hair() + //H.regenerate_icons() \ No newline at end of file diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 96c4d993072..ca4339761eb 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -809,7 +809,7 @@ datum/preferences if("ghost_whispers") chat_toggles ^= CHAT_GHOSTWHISPER - + if("ghost_radio") chat_toggles ^= CHAT_GHOSTRADIO @@ -889,11 +889,6 @@ datum/preferences backbag = 1 //Same as above character.backbag = backbag - /* - //Debugging report to track down a bug, which randomly assigned the plural gender to people. - if(character.gender in list(PLURAL, NEUTER)) - if(isliving(src)) //Ghosts get neuter by default - message_admins("[character] ([character.ckey]) has spawned with their gender as plural or neuter. Please notify coders.") - character.gender = MALE - */ - + character.update_body() + character.update_hair() + //character.regenerate_icons() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 9139c933661..3c324b4081d 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -43,12 +43,6 @@ There are several things that need to be remembered: update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and eyes were merged into update_body()) -> I repurposed an old unused variable which was in the code called (coincidentally) var/update_icon - It can be used as another method of triggering regenerate_icons(). It's basically a flag that when set to non-zero - will call regenerate_icons() at the next life() call and then reset itself to 0. - The idea behind it is icons are regenerated only once, even if multiple events requested it. - //NOTE: fairly unused, maybe this could be removed? - If you have any questions/constructive-comments/bugs-to-report Please contact me on #coderbus IRC. ~Carnie x //Carn can sometimes be hard to reach now. However IRC is still your best bet for getting help. From 721b81373a169505dc7b5592b32c4ec2c526764c Mon Sep 17 00:00:00 2001 From: MrPerson Date: Thu, 19 Mar 2015 21:35:24 -0700 Subject: [PATCH 2/2] Removed commented out regenerate_icons() --- code/modules/admin/create_mob.dm | 3 +-- code/modules/client/preferences.dm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 1b1de26a255..11ed127148b 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -22,5 +22,4 @@ H.eye_color = random_eye_color() H.dna.blood_type = random_blood_type() H.update_body() - H.update_hair() - //H.regenerate_icons() \ No newline at end of file + H.update_hair() \ No newline at end of file diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ca4339761eb..8c058c98459 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -890,5 +890,4 @@ datum/preferences character.backbag = backbag character.update_body() - character.update_hair() - //character.regenerate_icons() \ No newline at end of file + character.update_hair() \ No newline at end of file