diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 4d05ff2a8d..76320e76b5 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -426,9 +426,9 @@ var/global/datum/controller/occupations/job_master //if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head) // custom_equip_leftovers += thing //else - if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket) //RS ADD + if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket) continue - if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD + if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) continue if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) to_chat(H, span_notice("Equipping you with \the [thing]!")) @@ -455,9 +455,9 @@ var/global/datum/controller/occupations/job_master // If some custom items could not be equipped before, try again now. for(var/thing in custom_equip_leftovers) var/datum/gear/G = gear_datums[thing] - if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket) //RS ADD + if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket) continue - if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD + if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) continue if(G.slot in custom_equip_slots) spawn_in_storage += thing diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index 2744698467..65ddbce69a 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -137,7 +137,7 @@ var/global/list/valid_ringtones = list( . += "PDA Type: [pdachoicelist[pref.pdachoice]]
" . += "Communicator Visibility: [(pref.communicator_visibility) ? "Yes" : "No"]
" . += "Ringtone (leave blank for job default): [pref.ringtone]
" - . += "Spawn With Shoes:[(pref.shoe_hater) ? "No" : "Yes"]
" //RS Addition + . += "Spawn With Shoes:[(pref.shoe_hater) ? "No" : "Yes"]
" . += "Spawn With Jacket:[(pref.no_jacket) ? "No" : "Yes"]
" return jointext(.,null) @@ -213,15 +213,13 @@ var/global/list/valid_ringtones = list( else pref.ringtone = choice return TOPIC_REFRESH - else if(href_list["toggle_shoes"]) //RS ADD START + else if(href_list["toggle_shoes"]) if(CanUseTopic(user)) pref.shoe_hater = !pref.shoe_hater return TOPIC_REFRESH - //RS ADD END - else if(href_list["toggle_jacket"]) //RS ADD START + else if(href_list["toggle_jacket"]) if(CanUseTopic(user)) pref.no_jacket = !pref.no_jacket return TOPIC_REFRESH - //RS ADD END return ..()