From 86d709e1509c2dfed1ef1807311646c402eaf315 Mon Sep 17 00:00:00 2001 From: Kilakk Date: Sat, 24 Aug 2013 23:52:00 -0400 Subject: [PATCH 1/2] Fixed medical HUDs not being able to set SSD status correctly --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8c41ec8c9a3..13fb91770b2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -676,7 +676,7 @@ for (var/datum/data/record/R in data_core.general) if (R.fields["id"] == E.fields["id"]) - var/setmedical = input(usr, "Specify a new medical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("*Deceased*", "*Unconscious*", "Physically Unfit", "Active", "Cancel") + var/setmedical = input(usr, "Specify a new medical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("*SSD*", "*Deceased*", "Physically Unfit", "Active", "Disabled", "Cancel") if(hasHUD(usr,"medical")) if(setmedical != "Cancel") @@ -1358,4 +1358,4 @@ mob/living/carbon/human/yank_out_object() else src << "You do not have enough chemicals stored to reproduce." - return + return From e85ddd3b9ae0f923264b04affd2b8fb20a522f9c Mon Sep 17 00:00:00 2001 From: Segrain Date: Sun, 25 Aug 2013 09:27:05 +0300 Subject: [PATCH 2/2] Fix for unisex hairstyles. --- code/__HELPERS/mobs.dm | 4 ++-- code/modules/client/preferences.dm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index df7e4f18901..7d345e1ea28 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -4,7 +4,7 @@ proc/random_hair_style(gender, species = "Human") var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] - if(gender != S.gender) + if(gender != S.gender && S.gender != NEUTER) continue if(!(species in S.species_allowed)) continue @@ -21,7 +21,7 @@ proc/random_facial_hair_style(gender, species = "Human") var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender) + if(gender != S.gender && S.gender != NEUTER) continue if(!(species in S.species_allowed)) continue diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f4cb339f045..c15bfb3f8da 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -822,7 +822,7 @@ datum/preferences var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] - if(gender != S.gender) + if(gender != S.gender && S.gender != NEUTER) continue if( !(species in S.species_allowed)) continue @@ -838,7 +838,7 @@ datum/preferences var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender) + if(gender != S.gender && S.gender != NEUTER) continue if( !(species in S.species_allowed)) continue @@ -921,7 +921,7 @@ datum/preferences var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender) + if(gender != S.gender && S.gender != NEUTER) continue if( !(species in S.species_allowed)) continue