mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-27 10:33:21 +00:00
[MIRROR] Default Jacket Toggle (#9880)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
43025c1a23
commit
f04719c7d8
@@ -127,7 +127,8 @@ var/list/outfits_decls_by_type_
|
|||||||
if(uniform)
|
if(uniform)
|
||||||
H.equip_to_slot_or_del(new uniform(H),slot_w_uniform)
|
H.equip_to_slot_or_del(new uniform(H),slot_w_uniform)
|
||||||
if(suit)
|
if(suit)
|
||||||
H.equip_to_slot_or_del(new suit(H),slot_wear_suit)
|
if(!(H.client?.prefs?.no_jacket))
|
||||||
|
H.equip_to_slot_or_del(new suit(H),slot_wear_suit)
|
||||||
if(back)
|
if(back)
|
||||||
H.equip_to_slot_or_del(new back(H),slot_back)
|
H.equip_to_slot_or_del(new back(H),slot_back)
|
||||||
if(belt)
|
if(belt)
|
||||||
|
|||||||
@@ -439,6 +439,8 @@ var/global/datum/controller/occupations/job_master
|
|||||||
//if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
|
//if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
|
||||||
// custom_equip_leftovers += thing
|
// custom_equip_leftovers += thing
|
||||||
//else
|
//else
|
||||||
|
if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket)
|
||||||
|
continue
|
||||||
/* CHOMPRemove Start, remove RS No shoes
|
/* CHOMPRemove Start, remove RS No shoes
|
||||||
if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD
|
if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD
|
||||||
continue
|
continue
|
||||||
@@ -468,6 +470,8 @@ var/global/datum/controller/occupations/job_master
|
|||||||
// If some custom items could not be equipped before, try again now.
|
// If some custom items could not be equipped before, try again now.
|
||||||
for(var/thing in custom_equip_leftovers)
|
for(var/thing in custom_equip_leftovers)
|
||||||
var/datum/gear/G = gear_datums[thing]
|
var/datum/gear/G = gear_datums[thing]
|
||||||
|
if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket)
|
||||||
|
continue
|
||||||
/* CHOMPRemove Start, remove RS No shoes
|
/* CHOMPRemove Start, remove RS No shoes
|
||||||
if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD
|
if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
pref.communicator_visibility = save_data["communicator_visibility"]
|
pref.communicator_visibility = save_data["communicator_visibility"]
|
||||||
pref.ringtone = save_data["ttone"] // CHOMPEdit - We use ttone in the pref so that it doesnt get reset
|
pref.ringtone = save_data["ttone"] // CHOMPEdit - We use ttone in the pref so that it doesnt get reset
|
||||||
//pref.shoe_hater = save_data["shoe_hater"] //CHOMPRemove, remove RS No shoes
|
//pref.shoe_hater = save_data["shoe_hater"] //CHOMPRemove, remove RS No shoes
|
||||||
|
pref.no_jacket = save_data["no_jacket"]
|
||||||
|
|
||||||
/datum/category_item/player_setup_item/general/equipment/save_character(list/save_data)
|
/datum/category_item/player_setup_item/general/equipment/save_character(list/save_data)
|
||||||
save_data["all_underwear"] = pref.all_underwear
|
save_data["all_underwear"] = pref.all_underwear
|
||||||
@@ -30,6 +31,7 @@
|
|||||||
save_data["communicator_visibility"] = pref.communicator_visibility
|
save_data["communicator_visibility"] = pref.communicator_visibility
|
||||||
save_data["ttone"] = pref.ringtone // CHOMPEdit - We use ttone in the pref so that it doesnt get reset
|
save_data["ttone"] = pref.ringtone // CHOMPEdit - We use ttone in the pref so that it doesnt get reset
|
||||||
//save_data["shoe_hater"] = pref.shoe_hater //CHOMPRemove, remove RS No shoes
|
//save_data["shoe_hater"] = pref.shoe_hater //CHOMPRemove, remove RS No shoes
|
||||||
|
save_data["no_jacket"] = pref.no_jacket
|
||||||
|
|
||||||
var/global/list/valid_ringtones = list(
|
var/global/list/valid_ringtones = list(
|
||||||
"beep",
|
"beep",
|
||||||
@@ -137,6 +139,7 @@ var/global/list/valid_ringtones = list(
|
|||||||
. += "Communicator Visibility: <a href='byond://?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
|
. += "Communicator Visibility: <a href='byond://?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
|
||||||
. += "Ringtone (leave blank for job default): <a href='byond://?src=\ref[src];set_ringtone=1'><b>[pref.ringtone]</b></a><br>"
|
. += "Ringtone (leave blank for job default): <a href='byond://?src=\ref[src];set_ringtone=1'><b>[pref.ringtone]</b></a><br>"
|
||||||
//. += "Spawn With Shoes:<a href='byond://?src=\ref[src];toggle_shoes=1'><b>[(pref.shoe_hater) ? "No" : "Yes"]</b></a><br>" //RS Addition //CHOMPRemove, remove RS No shoes
|
//. += "Spawn With Shoes:<a href='byond://?src=\ref[src];toggle_shoes=1'><b>[(pref.shoe_hater) ? "No" : "Yes"]</b></a><br>" //RS Addition //CHOMPRemove, remove RS No shoes
|
||||||
|
. += "Spawn With Jacket:<a href='byond://?src=\ref[src];toggle_jacket=1'><b>[(pref.no_jacket) ? "No" : "Yes"]</b></a><br>"
|
||||||
|
|
||||||
return jointext(.,null)
|
return jointext(.,null)
|
||||||
|
|
||||||
@@ -218,5 +221,9 @@ var/global/list/valid_ringtones = list(
|
|||||||
return TOPIC_REFRESH
|
return TOPIC_REFRESH
|
||||||
//RS ADD END
|
//RS ADD END
|
||||||
*///CHOMPRemove End, remove RS No shoes
|
*///CHOMPRemove End, remove RS No shoes
|
||||||
|
else if(href_list["toggle_jacket"])
|
||||||
|
if(CanUseTopic(user))
|
||||||
|
pref.no_jacket = !pref.no_jacket
|
||||||
|
return TOPIC_REFRESH
|
||||||
|
|
||||||
return ..()
|
return ..()
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ var/list/preferences_datums = list()
|
|||||||
var/backbag = 2 //backpack type
|
var/backbag = 2 //backpack type
|
||||||
var/pdachoice = 1 //PDA type
|
var/pdachoice = 1 //PDA type
|
||||||
//var/shoe_hater = FALSE //RS ADD - if true, will spawn with no shoes //CHOMPRemove, remove RS No shoes
|
//var/shoe_hater = FALSE //RS ADD - if true, will spawn with no shoes //CHOMPRemove, remove RS No shoes
|
||||||
|
var/no_jacket = FALSE //if true, will not spawn with outfit's jacket/outer layer
|
||||||
var/h_style = "Bald" //Hair type
|
var/h_style = "Bald" //Hair type
|
||||||
var/grad_style = "none" //Gradient style
|
var/grad_style = "none" //Gradient style
|
||||||
var/f_style = "Shaved" //Face hair type
|
var/f_style = "Shaved" //Face hair type
|
||||||
|
|||||||
Reference in New Issue
Block a user