From cc6a94bc8a68708491a0896d1de79e0264554c42 Mon Sep 17 00:00:00 2001 From: byte <83266791+sarcoph@users.noreply.github.com> Date: Sun, 18 Sep 2022 08:04:21 -0800 Subject: [PATCH 1/5] transphobes in fucking shambles --- code/modules/surgery/bodyparts/bodyparts.dm | 5 +++-- .../code/modules/mob/dead/new_player/cosmetic_parts.dm | 8 +++++++- .../mob/living/carbon/human/cosmetic_part_handler.dm | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index b0208f9db..145d8e873 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -405,8 +405,9 @@ if(cosmetic_icon && is_organic_limb()) if(cosmetic_icon.icon) base_bp_icon = cosmetic_icon.icon - use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE - color_src = cosmetic_icon.color_src ? cosmetic_icon.color_src : MUTCOLORS + use_digitigrade = cosmetic_icon.support_digitigrade != null ? use_digitigrade : NOT_DIGITIGRADE + color_src = cosmetic_icon.color_src != null ? cosmetic_icon.color_src : MUTCOLORS + should_draw_gender = cosmetic_icon.support_gender != null ? cosmetic_icon.support_gender : should_draw_gender if(!H.dna.features["cosmetic_markings"]) body_markings = null auxmarking = null diff --git a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm index a08db8726..6c65ca5b9 100644 --- a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm +++ b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm @@ -23,6 +23,12 @@ safely. var/color_src = MUTCOLORS /** Whether or not this cosmetic part has an alternate form for digitigrade legs. */ var/support_digitigrade = TRUE + /** + WE + HATE + GENDER!!!!!!!!!! + */ + var/support_gender = FALSE /** Species IDs that support this cosmetic part. Bypassed with "show mismatched markings" option. */ var/list/supported_species @@ -151,4 +157,4 @@ safely. icon_state = "ipc_jointed" supported_species = list("ipc") color_src = MATRIXED - support_digitigrade = FALSE \ No newline at end of file + support_digitigrade = FALSE diff --git a/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm b/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm index 25b93526f..ff5fa8590 100644 --- a/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm +++ b/hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm @@ -14,4 +14,4 @@ var/datum/cosmetic_part/part = cosmetic_pref var/obj/item/bodypart/body_part = get_bodypart(zone) if(body_part && part) - body_part.apply_cosmetic(part) \ No newline at end of file + body_part.apply_cosmetic(part) From a9933e4e145f9bc179e116cc62eb143495360cde Mon Sep 17 00:00:00 2001 From: byte <83266791+sarcoph@users.noreply.github.com> Date: Sun, 18 Sep 2022 08:08:44 -0800 Subject: [PATCH 2/5] arms and legs are androgynous --- hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm index 6c65ca5b9..9d795fa5e 100644 --- a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm +++ b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm @@ -35,7 +35,9 @@ safely. /datum/cosmetic_part/head /datum/cosmetic_part/chest /datum/cosmetic_part/arms + support_gender = null /datum/cosmetic_part/legs + support_gender = null // HEADS // ========================================= From dde1f32afe7f7ae0a42382de2da7f18b50c5d8c0 Mon Sep 17 00:00:00 2001 From: byte <83266791+sarcoph@users.noreply.github.com> Date: Sun, 18 Sep 2022 08:09:49 -0800 Subject: [PATCH 3/5] nevermind, they're all androgynous --- .../code/modules/mob/dead/new_player/cosmetic_parts.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm index 9d795fa5e..99b4ad88b 100644 --- a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm +++ b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm @@ -28,16 +28,14 @@ safely. HATE GENDER!!!!!!!!!! */ - var/support_gender = FALSE + var/support_gender = null /** Species IDs that support this cosmetic part. Bypassed with "show mismatched markings" option. */ var/list/supported_species /datum/cosmetic_part/head /datum/cosmetic_part/chest /datum/cosmetic_part/arms - support_gender = null /datum/cosmetic_part/legs - support_gender = null // HEADS // ========================================= @@ -52,6 +50,7 @@ safely. name = "round ipc head" icon_state = "ipc_round" supported_species = list("ipc") + support_gender = null // CHESTS @@ -68,6 +67,7 @@ safely. icon_state = "ipc_sleek" supported_species = list("ipc") color_src = MATRIXED + support_gender = null /datum/cosmetic_part/chest/ipc_jointed id = "ipc_jointed" @@ -75,6 +75,7 @@ safely. icon_state = "ipc_jointed" supported_species = list("ipc") color_src = MATRIXED + support_gender = null // ARMS From 7a92eb7dc3282d4259dfc91ef817f4ca0e465b45 Mon Sep 17 00:00:00 2001 From: byte <83266791+sarcoph@users.noreply.github.com> Date: Sun, 18 Sep 2022 08:10:16 -0800 Subject: [PATCH 4/5] do it RIGHT THIS TIME --- .../code/modules/mob/dead/new_player/cosmetic_parts.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm index 99b4ad88b..7b71ff33e 100644 --- a/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm +++ b/hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm @@ -50,7 +50,7 @@ safely. name = "round ipc head" icon_state = "ipc_round" supported_species = list("ipc") - support_gender = null + support_gender = FALSE // CHESTS @@ -67,7 +67,7 @@ safely. icon_state = "ipc_sleek" supported_species = list("ipc") color_src = MATRIXED - support_gender = null + support_gender = FALSE /datum/cosmetic_part/chest/ipc_jointed id = "ipc_jointed" @@ -75,7 +75,7 @@ safely. icon_state = "ipc_jointed" supported_species = list("ipc") color_src = MATRIXED - support_gender = null + support_gender = FALSE // ARMS From 409fad64390fe9b1656c1a5827f9adcec22c57c7 Mon Sep 17 00:00:00 2001 From: byte <83266791+sarcoph@users.noreply.github.com> Date: Sun, 18 Sep 2022 08:18:52 -0800 Subject: [PATCH 5/5] OK NOW ITS DONE --- code/modules/surgery/bodyparts/bodyparts.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 145d8e873..fc40f2487 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -405,7 +405,7 @@ if(cosmetic_icon && is_organic_limb()) if(cosmetic_icon.icon) base_bp_icon = cosmetic_icon.icon - use_digitigrade = cosmetic_icon.support_digitigrade != null ? use_digitigrade : NOT_DIGITIGRADE + use_digitigrade = cosmetic_icon.support_digitigrade ? use_digitigrade : NOT_DIGITIGRADE color_src = cosmetic_icon.color_src != null ? cosmetic_icon.color_src : MUTCOLORS should_draw_gender = cosmetic_icon.support_gender != null ? cosmetic_icon.support_gender : should_draw_gender if(!H.dna.features["cosmetic_markings"])