From fb1c3c10b7e370109458724cdaeea8e3cf7729e8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 5 Jan 2016 16:28:19 +1030 Subject: [PATCH] Should fix some issues with prosthesis customisation for FBPs. --- .../preference_setup/general/03_body.dm | 5 +++++ code/modules/client/preferences.dm | 2 +- icons/mob/monitor_icons.dmi | Bin 4661 -> 4656 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 61525cbb51..3df5086cf0 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -358,6 +358,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/datum/species/current_species = all_species[pref.species] if(!current_species.has_organ["brain"]) limb_selection_list -= "Full Body" + else if(pref.organ_data[BP_TORSO] == "cyborg") + limb_selection_list |= "Head" var/organ_tag = input(user, "Which limb do you want to change?") as null|anything in limb_selection_list @@ -394,6 +396,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if("Right Hand") limb = BP_R_HAND third_limb = BP_R_ARM + if("Head") + limb = BP_HEAD + choice_options = list("Prothesis") if("Full Body") limb = BP_TORSO third_limb = BP_GROIN diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e019291adc..7dca5b2c8c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -310,7 +310,7 @@ datum/preferences character.used_skillpoints = used_skillpoints // Destroy/cyborgize organs and limbs. - for(var/name in BP_ALL) + for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO)) var/status = organ_data[name] var/obj/item/organ/external/O = character.organs_by_name[name] if(O) diff --git a/icons/mob/monitor_icons.dmi b/icons/mob/monitor_icons.dmi index a50ee70dfbc77ee49487e02837809c38c601b254..5dbc224fa3041d6d3d12f7f8c112f9ce18338781 100644 GIT binary patch delta 280 zcmV+z0q6d;B(Nl~S^)tTlUo5Bf5%^8+N&9E7Dg_+l$Oy$`wPQqG{@AngX}Ei@0)b6 z*`+3|6kR0HdwNeYUefjUV|SpN{f>MCI%N%gr^O2=S+8o}jKynCvIdlF{7>P$@Gzze z)gC`9EzD^_vRa{=fF%1uafT^h#htB6HIDo>Xfcdw$;ucd5x^w)1Kf(;e~p+6q5i*s zN_UW$Uq-OGh-qD8d%!0dvnY&AsC@h5D%fwtcq4p=DVL!b&O;Gl6%$@x%LB)@QfhFs zz?>C4Mm8Yufq`dhEDQE`U}NrG~2|rgX}Ei@0WD2 z#U*AX6kR0HdwNeY-jcWd`{77-ABXe{&?#%kD=D5>n)Isnax9+nG?Ac$^go63+{2h| zRC_*Enww^mCbdF00n_9Y`30st3p-n7nv+{@9VgVF`7ov>Ekm3@022dde=}r87b9dt zsMm<7bO%ulWdQsyLSiRv5BM;97P%2or7wSM1^tbX!EoPU-0NHrV{;+%Dx|!=omHo| zLTGSzKyzBK5G#S>s-YKaEDX^N6tf+&CASp)_b|zcz3XkWc>=c&V8n&R