diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0f48a9dd..6b432547 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -69,6 +69,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/pda_skin = PDA_SKIN_ALT var/list/alt_titles_preferences = list() + var/static/preview_job_outfit = TRUE //shouldn't be something that's saved, but this is a preference option var/uses_glasses_colour = 0 @@ -1049,8 +1050,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(!gear_tab) gear_tab = GLOB.loadout_items[1] dat += "" - dat += "" - dat += "" + dat += "" + dat += "" dat += "
[gear_points] loadout points remaining. \[Clear Loadout\]
You can only choose one item per category, unless it's an item that spawns in your backpack or hands.
[gear_points] loadout points remaining. \[Clear Loadout\] \[[preview_job_outfit ? "Enable" : "Disable"] Job Outfit Preview\]
You can only choose two items per category, unless it's an item that spawns in your backpack or hands.
" var/firstcat = TRUE for(var/i in GLOB.loadout_items) @@ -2642,6 +2643,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(gear_points >= initial(G.cost)) LAZYADD(chosen_gear, G.type) gear_points -= initial(G.cost) + if(href_list["toggle_outfit_visibility"]) + preview_job_outfit = !preview_job_outfit ShowChoices(user) return 1 diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index d2d49770..a22724c8 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -73,7 +73,7 @@ previewJob = job break - if(previewJob) + if(previewJob && preview_job_outfit) if(current_tab != 2) mannequin.job = previewJob.title previewJob.equip(mannequin, TRUE) diff --git a/modular_citadel/code/controllers/subsystem/job.dm b/modular_citadel/code/controllers/subsystem/job.dm index 5234ccfc..f66cbe81 100644 --- a/modular_citadel/code/controllers/subsystem/job.dm +++ b/modular_citadel/code/controllers/subsystem/job.dm @@ -16,12 +16,14 @@ continue var/obj/item/I = new G.path - if(backpackstuffs && G.category == SLOT_IN_BACKPACK && iscarbon(M)) + if(iscarbon(M) && backpackstuffs && (G.category == SLOT_IN_BACKPACK || G.blacklist_join_equip)) var/mob/living/carbon/C = M var/obj/item/storage/backpack/B = C.back if(!B || !SEND_SIGNAL(B, COMSIG_TRY_STORAGE_INSERT, I, null, TRUE, TRUE)) I.forceMove(get_turf(C)) continue + else if(G.blacklist_join_equip) //Assume we're gonna be put in a backpack and not equipped + continue else if(backpackstuffs && G.category != SLOT_IN_BACKPACK) continue if(!M.equip_to_slot_if_possible(I, G.category, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 2422f268..99474806 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -35,7 +35,7 @@ #define COIN_CHARGE 3 /obj/machinery/vending/kink - name = "KinkMate" + name = "\improper KinkMate" desc = "A vending machine for all your unmentionable desires." icon = 'icons/obj/citvending.dmi' icon_state = "kink" @@ -66,6 +66,7 @@ /obj/item/electropack/vibrator = 2, ) contraband = list( + /obj/item/clothing/under/gear_harness = 3, /obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, /obj/item/clothing/under/mankini = 1, diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 641d4f2e..7d0f0543 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -19,4 +19,4 @@ name = "A diamond ring" category = SLOT_GLOVES path = /obj/item/clothing/gloves/ring/diamond - cost = 4 \ No newline at end of file + cost = 4 diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index b8cb0885..9a92afbc 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -70,4 +70,4 @@ name = "Improper Roman shield" category = SLOT_HANDS path = /obj/item/shield/riot/roman/fake - cost = 2 \ No newline at end of file + cost = 2 diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 238af10b..9b3239a5 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -27,6 +27,7 @@ name = "Rice hat" category = SLOT_HEAD path = /obj/item/clothing/head/rice_hat + blacklist_join_equip = TRUE /datum/gear/ushanka name = "Ushanka" @@ -53,12 +54,14 @@ category = SLOT_HEAD path = /obj/item/clothing/head/flakhelm cost = 2 + blacklist_join_equip = TRUE /datum/gear/delinquent //Now you too can become like your favorite punchy ghost protagonist name = "Delinquent Hat" category = SLOT_HEAD path = /obj/item/clothing/head/delinquent cost = 3 + blacklist_join_equip = TRUE /datum/gear/bunnyears name = "Bunny Ears" diff --git a/modular_citadel/code/modules/client/loadout/loadout.dm b/modular_citadel/code/modules/client/loadout/loadout.dm index f0b80f65..f184e63a 100644 --- a/modular_citadel/code/modules/client/loadout/loadout.dm +++ b/modular_citadel/code/modules/client/loadout/loadout.dm @@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/list/restricted_roles var/list/ckeywhitelist var/restricted_desc + var/blacklist_join_equip = FALSE //If we don't equip this when we join /datum/gear/New() ..() diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 62636b42..81bea21c 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -229,7 +229,7 @@ path = /obj/item/clothing/under/bb_sweater/blue /datum/gear/keyholesweater - name = "Keyhole Sweater" + name = "Keyhole Sweater" //sus category = SLOT_W_UNIFORM path = /obj/item/clothing/under/keyholesweater @@ -412,38 +412,45 @@ name = "Gear Harness" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/gear_harness + blacklist_join_equip = TRUE /datum/gear/pinkstripper name = "Pink stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_pink + blacklist_join_equip = TRUE /datum/gear/greenstripper name = "Green stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green + blacklist_join_equip = TRUE /datum/gear/polybikini name = "Polychromic Bikini" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/bikini cost = 2 + blacklist_join_equip = TRUE /datum/gear/polystripper name = "Polychromic Stripper Outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/stripper cost = 2 + blacklist_join_equip = TRUE /datum/gear/polypantsu name = "Polychromic Panties" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/shortpants/pantsu + blacklist_join_equip = TRUE /datum/gear/polybulge name = "Polychromic Voluminous Thong" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/bulge + blacklist_join_equip = TRUE /datum/gear/polybottomless name = "Polychromic Bottomless Shirt" @@ -456,18 +463,14 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/corset cost = 1 - -/datum/gear/corset - name = "Corset" - category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/corset - cost = 1 + blacklist_join_equip = TRUE /datum/gear/shortsbra name = "Kromatic Shorts and Top" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/polychromic/shortsbra cost = 1 + blacklist_join_equip = TRUE /datum/gear/gladiator name = "Gladiator uniform" @@ -486,4 +489,4 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/greenplaidshirt cost = 1 - ckeywhitelist = list("chemlight") \ No newline at end of file + ckeywhitelist = list("chemlight")