[MIRROR] Ports "No Shoes" from RogueStar (#8131)

Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-06-03 08:07:44 -07:00
committed by GitHub
parent 7d4b37cc3e
commit c272119398
4 changed files with 22 additions and 0 deletions

View File

@@ -127,7 +127,10 @@ var/list/outfits_decls_by_type_
if(gloves) if(gloves)
H.equip_to_slot_or_del(new gloves(H),slot_gloves) H.equip_to_slot_or_del(new gloves(H),slot_gloves)
if(shoes) if(shoes)
//CHOMPEdit Start, remove RS No shoes
// if(!(H.client?.prefs?.shoe_hater)) //RS ADD
H.equip_to_slot_or_del(new shoes(H),slot_shoes) H.equip_to_slot_or_del(new shoes(H),slot_shoes)
//CHOMPEdit End, remove RS No Shoes
if(mask) if(mask)
H.equip_to_slot_or_del(new mask(H),slot_wear_mask) H.equip_to_slot_or_del(new mask(H),slot_wear_mask)
if(head) if(head)

View File

@@ -430,6 +430,10 @@ 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
/* CHOMPRemove Start, remove RS No shoes
if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD
continue
*///CHOMPRemove End, remove RS No shoes
if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot))
to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>") to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>")
if(G.slot != slot_tie) if(G.slot != slot_tie)
@@ -455,6 +459,10 @@ 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]
/* CHOMPRemove Start, remove RS No shoes
if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD
continue
*///CHOMPRemove End, remove RS No shoes
if(G.slot in custom_equip_slots) if(G.slot in custom_equip_slots)
spawn_in_storage += thing spawn_in_storage += thing
else else

View File

@@ -13,6 +13,7 @@
S["pdachoice"] >> pref.pdachoice S["pdachoice"] >> pref.pdachoice
S["communicator_visibility"] >> pref.communicator_visibility S["communicator_visibility"] >> pref.communicator_visibility
S["ttone"] >> pref.ringtone // CHOMPEdit - We use ttone in the pref so that it doesnt get reset S["ttone"] >> pref.ringtone // CHOMPEdit - We use ttone in the pref so that it doesnt get reset
//S["shoe_hater"] >> pref.shoe_hater //RS ADD //CHOMPRemove, remove RS No shoes
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S) /datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
S["all_underwear"] << pref.all_underwear S["all_underwear"] << pref.all_underwear
@@ -21,6 +22,7 @@
S["pdachoice"] << pref.pdachoice S["pdachoice"] << pref.pdachoice
S["communicator_visibility"] << pref.communicator_visibility S["communicator_visibility"] << pref.communicator_visibility
S["ttone"] << pref.ringtone // CHOMPEdit - We use ttone in the pref so that it doesnt get reset S["ttone"] << pref.ringtone // CHOMPEdit - We use ttone in the pref so that it doesnt get reset
//S["shoe_hater"] << pref.shoe_hater //RS ADD //CHOMPRemove, remove RS No shoes
var/global/list/valid_ringtones = list( var/global/list/valid_ringtones = list(
"beep", "beep",
@@ -121,6 +123,7 @@ var/global/list/valid_ringtones = list(
. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>" . += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
. += "Communicator Visibility: <a href='?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>" . += "Communicator Visibility: <a href='?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
. += "Ringtone (leave blank for job default): <a href='?src=\ref[src];set_ringtone=1'><b>[pref.ringtone]</b></a><br>" . += "Ringtone (leave blank for job default): <a href='?src=\ref[src];set_ringtone=1'><b>[pref.ringtone]</b></a><br>"
//. += "Spawn With Shoes:<a href='?src=\ref[src];toggle_shoes=1'><b>[(pref.shoe_hater) ? "No" : "Yes"]</b></a><br>" //RS Addition //CHOMPRemove, remove RS No shoes
return jointext(.,null) return jointext(.,null)
@@ -189,5 +192,12 @@ var/global/list/valid_ringtones = list(
else else
pref.ringtone = choice pref.ringtone = choice
return TOPIC_REFRESH return TOPIC_REFRESH
/*CHOMPRemove Start, remove RS No shoes
else if(href_list["toggle_shoes"]) //RS ADD START
if(CanUseTopic(user))
pref.shoe_hater = !pref.shoe_hater
return TOPIC_REFRESH
//RS ADD END
*///CHOMPRemove End, remove RS No shoes
return ..() return ..()

View File

@@ -50,6 +50,7 @@ var/list/preferences_datums = list()
var/blood_reagents = "default" //blood restoration reagents var/blood_reagents = "default" //blood restoration reagents
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/h_style = "Bald" //Hair type var/h_style = "Bald" //Hair type
var/r_hair = 0 //Hair color var/r_hair = 0 //Hair color
var/g_hair = 0 //Hair color var/g_hair = 0 //Hair color