diff --git a/code/__SANDCODE/DEFINES/DNA.dm b/code/__SANDCODE/DEFINES/DNA.dm index 547ab21071e6..93b8b15fd5a7 100644 --- a/code/__SANDCODE/DEFINES/DNA.dm +++ b/code/__SANDCODE/DEFINES/DNA.dm @@ -1,3 +1,4 @@ #define PREVIEW_PREF_JOB "Job" #define PREVIEW_PREF_LOADOUT "Loadout" #define PREVIEW_PREF_NAKED "Naked" +#define PREVIEW_PREF_NAKED_AROUSED "Naked - Aroused" diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index b13c5151550f..c8131dc1cdff 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -41,7 +41,8 @@ return FALSE if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state)) aroused_state = new_state - owner.log_message("[src]'s arousal was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE) + if(cause) + owner.log_message("[src]'s arousal was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE) return aroused_state /obj/item/organ/genital/proc/update() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 1102dd2674da..360db2c9c978 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -501,11 +501,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" dat += "" dat += "" - dat += "" if(character_settings_tab == LOADOUT_CHAR_TAB) //if loadout //calculate your gear points from the chosen item @@ -521,16 +524,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) else chosen_gear = list() - dat += "" else - dat += "" - dat += "" dat += "" diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index ea5223975443..d51048dc0a2f 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -56,6 +56,10 @@ if(PREVIEW_PREF_LOADOUT) SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE) SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE) + if(PREVIEW_PREF_NAKED_AROUSED) + for(var/obj/item/organ/genital/genital in mannequin.internal_organs) + if(CHECK_BITFIELD(genital.genital_flags, GENITAL_CAN_AROUSE)) + genital.set_aroused_state(TRUE, null) mannequin.regenerate_icons() diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 197f08835653..9e073291515c 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -6,583 +6,3 @@ path = /obj/item/bikehorn/golden category = LOADOUT_CATEGORY_DONATOR ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard - -/datum/gear/donator/pet - name = "Pet Beacon" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/choice_beacon/pet - ckeywhitelist = list() - donator_group_id = DONATOR_GROUP_TIER_1 // can be accessed by all donators - -/datum/gear/donator/carpet - name = "Carpet Beacon" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/choice_beacon/box/carpet - ckeywhitelist = list() - donator_group_id = DONATOR_GROUP_TIER_1 - -/datum/gear/donator/chameleon_bedsheet - name = "Chameleon Bedsheet" - slot = ITEM_SLOT_NECK - path = /obj/item/bedsheet/chameleon - ckeywhitelist = list() - donator_group_id = DONATOR_GROUP_TIER_1 - -/datum/gear/donator/donortestingbikehorn - name = "Donor item testing bikehorn" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/bikehorn - geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings - -/datum/gear/donator/kevhorn - name = "Airhorn" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/bikehorn/airhorn - ckeywhitelist = list("kevinz000") - -/datum/gear/donator/kiaracloak - name = "Kiara's cloak" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/cloak/inferno - ckeywhitelist = list("inferno707") - -/datum/gear/donator/kiaracollar - name = "Kiara's collar" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/petcollar/inferno - ckeywhitelist = list("inferno707") - -/datum/gear/donator/kiaramedal - name = "Insignia of Steele" - slot = ITEM_SLOT_ACCESSORY - path = /obj/item/clothing/accessory/medal/steele - ckeywhitelist = list("inferno707") - handle_post_equip = TRUE - -/datum/gear/donator/hheart - name = "The Hollow Heart" - slot = ITEM_SLOT_MASK - path = /obj/item/clothing/mask/hheart - ckeywhitelist = list("inferno707") - -/datum/gear/donator/engravedzippo - name = "Engraved zippo" - slot = ITEM_SLOT_HANDS - path = /obj/item/lighter/gold - ckeywhitelist = list("dirtyoldharry") - -/datum/gear/donator/geisha - name = "Geisha suit" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/costume/geisha - ckeywhitelist = list("atiefling") - -/datum/gear/donator/specialscarf - name = "Special scarf" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/scarf/zomb - ckeywhitelist = list("zombierobin") - -/datum/gear/donator/redmadcoat - name = "The Mad's labcoat" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/toggle/labcoat/mad/red - ckeywhitelist = list("zombierobin") - -/datum/gear/donator/santahat - name = "Santa hat" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/santa/fluff - ckeywhitelist = list("illotafv") - -/datum/gear/donator/reindeerhat - name = "Reindeer hat" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/hardhat/reindeer/fluff - ckeywhitelist = list("illotafv") - -/datum/gear/donator/treeplushie - name = "Christmas tree plushie" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/plush/tree - ckeywhitelist = list("illotafv") - -/datum/gear/donator/santaoutfit - name = "Santa costume" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/space/santa/fluff - ckeywhitelist = list("illotafv") - -/datum/gear/donator/treecloak - name = "Christmas tree cloak" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/cloak/festive - ckeywhitelist = list("illotafv") - -/datum/gear/donator/carrotplush - name = "Carrot plushie" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/plush/carrot - ckeywhitelist = list("improvedname") - -/datum/gear/donator/carrotcloak - name = "Carrot cloak" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/cloak/carrot - ckeywhitelist = list("improvedname") - -/datum/gear/donator/albortorosamask - name = "Alborto Rosa mask" - slot = ITEM_SLOT_MASK - path = /obj/item/clothing/mask/luchador/zigfie - ckeywhitelist = list("zigfie") - -/datum/gear/donator/mankini - name = "Mankini" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/misc/stripper/mankini - ckeywhitelist = list("zigfie") - -/datum/gear/donator/pinkshoes - name = "Pink shoes" - slot = ITEM_SLOT_FEET - path = /obj/item/clothing/shoes/sneakers/pink - ckeywhitelist = list("zigfie") - -/datum/gear/donator/reecesgreatcoat - name = "Reece's Great Coat" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/trenchcoat/green - ckeywhitelist = list("geemiesif") - -/datum/gear/donator/russianflask - name = "Russian flask" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/reagent_containers/food/drinks/flask/russian - cost = 2 - ckeywhitelist = list("slomka") - -/datum/gear/donator/stalkermask - name = "S.T.A.L.K.E.R. mask" - slot = ITEM_SLOT_MASK - path = /obj/item/clothing/mask/gas/stalker - ckeywhitelist = list("slomka") - -/datum/gear/donator/stripedcollar - name = "Striped collar" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/petcollar/stripe - ckeywhitelist = list("jademanique") - -/datum/gear/donator/performersoutfit - name = "Bluish performer's outfit" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/costume/singer/yellow/custom - ckeywhitelist = list("killer402402") - -/datum/gear/donator/vermillion - name = "Vermillion clothing" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/suit/vermillion - ckeywhitelist = list("fractious") - -/datum/gear/donator/AM4B - name = "Foam Force AM4-B" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/gun/ballistic/automatic/AM4B - ckeywhitelist = list("zeronetalpha") - -/datum/gear/donator/carrotsatchel - name = "Carrot Satchel" - slot = ITEM_SLOT_HANDS - path = /obj/item/storage/backpack/satchel/carrot - ckeywhitelist = list("improvedname") - -/datum/gear/donator/naomisweater - name = "worn black sweater" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/sweater/black/naomi - ckeywhitelist = list("technicalmagi") - -/datum/gear/donator/naomicollar - name = "worn pet collar" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/petcollar/naomi - ckeywhitelist = list("technicalmagi") - -/datum/gear/donator/gladiator - name = "Gladiator Armor" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/under/costume/gladiator - ckeywhitelist = list("aroche") - -/datum/gear/donator/bloodredtie - name = "Blood Red Tie" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/tie/bloodred - ckeywhitelist = list("kyutness") - -/datum/gear/donator/puffydress - name = "Puffy Dress" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/puffydress - ckeywhitelist = list("stallingratt") - -/datum/gear/donator/labredblack - name = "Black and Red Coat" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/toggle/labcoat/labredblack - ckeywhitelist = list("blakeryan", "durandalphor") - -/datum/gear/donator/torisword - name = "Rainbow Zweihander" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/dualsaber/hypereutactic/toy/rainbow - ckeywhitelist = list("annoymous35") - -/datum/gear/donator/darksabre - name = "Dark Sabre" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/darksabre - ckeywhitelist = list("inferno707") - -/datum/gear/donator/darksabresheath - name = "Dark Sabre Sheath" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/storage/belt/sabre/darksabre - ckeywhitelist = list("inferno707") - -/datum/gear/donator/toriball - name = "Rainbow Tennis Ball" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow - ckeywhitelist = list("annoymous35") - -/datum/gear/donator/izzyball - name = "Katlin's Ball" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/fluff/tennis_poly/tri/squeak/izzy - ckeywhitelist = list("izzyinbox") - -/datum/gear/donator/cloak - name = "Green Cloak" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/cloak/green - ckeywhitelist = list("killer402402") - -/datum/gear/donator/steelflask - name = "Steel Flask" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/reagent_containers/food/drinks/flask/steel - cost = 2 - ckeywhitelist = list("nik707") - -/datum/gear/donator/paperhat - name = "Paper Hat" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/paperhat - ckeywhitelist = list("kered2") - -/datum/gear/donator/cloakce - name = "Polychromic CE Cloak" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/neck/cloak/polychromic/polyce - ckeywhitelist = list("worksbythesea", "blakeryan") - loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC - loadout_initial_colors = list("#808080", "#8CC6FF", "#FF3535") - -/datum/gear/donator/ssk - name = "Stun Sword Kit" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/ssword_kit - ckeywhitelist = list("phillip458") - -/datum/gear/donator/techcoat - name = "Techomancers Labcoat" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat - ckeywhitelist = list("wilchen") - -/datum/gear/donator/leechjar - name = "Jar of Leeches" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/custom/leechjar - ckeywhitelist = list("sgtryder") - -/datum/gear/donator/darkarmor - name = "Dark Armor" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/suit/armor/vest/darkcarapace - ckeywhitelist = list("inferno707") - -/datum/gear/donator/devilwings - name = "Strange Wings" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/devilwings - ckeywhitelist = list("kitsun") - -/datum/gear/donator/flagcape - name = "US Flag Cape" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/neck/flagcape - ckeywhitelist = list("darnchacha") - -/datum/gear/donator/luckyjack - name = "Lucky Jackboots" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/shoes/lucky - ckeywhitelist = list("spiralwithin") - -/datum/gear/donator/raiqbawks - name = "Miami Boombox" - slot = ITEM_SLOT_HANDS - cost = 2 - path = /obj/item/boombox/raiq - ckeywhitelist = list("chefferz") - -/datum/gear/donator/m41 - name = "Toy M41" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/gun/m41 - ckeywhitelist = list("thalverscholen") - -/datum/gear/donator/Divine_robes - name = "Divine robes" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/custom/lunasune - ckeywhitelist = list("invader4352") - -/datum/gear/donator/gothcoat - name = "Goth Coat" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/gothcoat - ckeywhitelist = list("norko") - -/datum/gear/donator/corgisuit - name = "Corgi Suit" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/hooded/ian_costume - ckeywhitelist = list("cathodetherobot") - -/datum/gear/donator/sharkcloth - name = "Leon's Skimpy Outfit" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/under/custom/leoskimpy - ckeywhitelist = list("spectrosis") - -/datum/gear/donator/mimemask - name = "Mime Mask" - slot = ITEM_SLOT_MASK - path = /obj/item/clothing/mask/gas/mime - ckeywhitelist = list("pireamaineach") - -/datum/gear/donator/mimeoveralls - name = "Mime's Overalls" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/under/custom/mimeoveralls - ckeywhitelist = list("pireamaineach") - -/datum/gear/donator/soulneck - name = "Soul Necklace" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/undertale - ckeywhitelist = list("twilightic") - -/datum/gear/donator/frenchberet - name = "French Beret" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/frenchberet - ckeywhitelist = list("notazoltan") - -/datum/gear/donator/zuliecloak - name = "Project: Zul-E" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/hooded/cloak/zuliecloak - ckeywhitelist = list("asky") - -/datum/gear/donator/blackredgold - name = "Black, Red, and Gold Coat" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/blackredgold - ckeywhitelist = list("ttbnc") - -/datum/gear/donator/fritzplush - name = "Fritz Plushie" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/plush/mammal/dog/fritz - ckeywhitelist = list("analwerewolf") - -/datum/gear/donator/kimono - name = "Kimono" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/kimono - ckeywhitelist = list("sfox63") - -/datum/gear/donator/commjacket - name = "Dusty Commisar's Cloak" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/commjacket - ckeywhitelist = list("sadisticbatter") - -/datum/gear/donator/mw2_russian_para - name = "Russian Paratrooper Jumper" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/custom/mw2_russian_para - ckeywhitelist = list("investigator77") - -/datum/gear/donator/longblackgloves - name = "Luna's Gauntlets" - slot = ITEM_SLOT_GLOVES - path = /obj/item/clothing/gloves/longblackgloves - ckeywhitelist = list("bigmanclancy") - -/datum/gear/donator/trendy_fit - name = "Trendy Fit" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/custom/trendy_fit - ckeywhitelist = list("midgetdragon") - -/datum/gear/donator/singery - name = "Yellow Performer Outfit" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/costume/singer/yellow - ckeywhitelist = list("maxlynchy") - -/datum/gear/donator/csheet - name = "NT Bedsheet" - slot = ITEM_SLOT_NECK - path = /obj/item/bedsheet/captain - ckeywhitelist = list("tikibomb") - -/datum/gear/donator/borgplush - name = "Robot Plush" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/toy/plush/borgplushie - ckeywhitelist = list("nicholaiavenicci") - -/datum/gear/donator/donorberet - name = "Atmos Beret" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/blueberet - ckeywhitelist = list("foxystalin") - -/datum/gear/donator/donorgoggles - name = "Flight Goggles" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/flight - ckeywhitelist = list("maxlynchy") - -/datum/gear/donator/onionneck - name = "Onion Necklace" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/necklace/onion - ckeywhitelist = list("cdrcross") - -/datum/gear/donator/mikubikini - name = "starlight singer bikini" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/custom/mikubikini - ckeywhitelist = list("grandvegeta") - -/datum/gear/donator/mikujacket - name = "starlight singer jacket" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/mikujacket - ckeywhitelist = list("grandvegeta") - -/datum/gear/donator/mikuhair - name = "starlight singer hair" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/head/mikuhair - ckeywhitelist = list("grandvegeta") - -/datum/gear/donator/mikugloves - name = "starlight singer gloves" - slot = ITEM_SLOT_GLOVES - path = /obj/item/clothing/gloves/mikugloves - ckeywhitelist = list("grandvegeta") - -/datum/gear/donator/mikuleggings - name = "starlight singer leggings" - slot = ITEM_SLOT_FEET - path = /obj/item/clothing/shoes/sneakers/mikuleggings - ckeywhitelist = list("grandvegeta") - -/datum/gear/donator/cosmos - name = "cosmic space bedsheet" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/bedsheet/cosmos - ckeywhitelist = list("grunnyyy") - -/datum/gear/donator/customskirt - name = "custom atmos skirt" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/under/custom/customskirt - ckeywhitelist = list("thakyz") - -/datum/gear/donator/hisakaki - name = "halo" - slot = ITEM_SLOT_HEAD - path = /obj/item/clothing/head/halo - ckeywhitelist = list("hisakaki") - -/datum/gear/donator/vest - name = "vest and shirt" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/custom/vest - ckeywhitelist = list("maylowfox") - -/datum/gear/donator/exo - name = "exo frame" - slot = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/custom/exo - ckeywhitelist = list("jesterz7") - -/datum/gear/donator/choker - name = "NT Choker" - slot = ITEM_SLOT_NECK - path = /obj/item/clothing/neck/petcollar/donorchoker - ckeywhitelist = list("trigillass") - -/datum/gear/donator/strangemask - name = "Strange Metal Mask" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/mask/breath/mmask - ckeywhitelist = list("sneka") - -/datum/gear/donator/smaiden - name = "shrine maiden outfit" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/smaiden - ckeywhitelist = list("ultimarifox") - -/datum/gear/donator/mgasmask - name = "Military Gas Mask" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/clothing/mask/gas/military - ckeywhitelist = list("unclebourbon") - -/datum/gear/donator/clownmask - name = "Clown Mask" - path = ITEM_SLOT_MASK - path = /obj/item/clothing/mask/gas/clown_hat - ckeywhitelist = list("djkouta") - -/datum/gear/donator/spacehoodie - name = "Space Hoodie" - path = ITEM_SLOT_OCLOTHING - path = /obj/item/clothing/suit/spacehoodie - ckeywhitelist = list("bidlink2") - -/datum/gear/donator/pokerchips - name = "pokerchip set" - slot = ITEM_SLOT_BACKPACK - path = /obj/item/storage/box/pockerchips - ckeywhitelist = list("greed2323") - -/datum/gear/donator/psychedelicjumpsuit - name = "psychedelic jumpsuit" - slot = ITEM_SLOT_ICLOTHING - path = /obj/item/clothing/under/misc/psyche - ckeywhitelist = list("commandnotrecognized") - diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm index f33beecb327a..0f58b4c48f40 100644 --- a/modular_citadel/code/modules/client/loadout/_loadout.dm +++ b/modular_citadel/code/modules/client/loadout/_loadout.dm @@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids) var/handle_post_equip = FALSE //NEW DONATOR SYTSEM STUFF - var/donoritem //autoset on new if null + var/donoritem //autoset on new if null var/donator_group_id //New donator group ID system. //END diff --git a/modular_citadel/code/modules/client/loadout/donator/accessory.dm b/modular_citadel/code/modules/client/loadout/donator/accessory.dm new file mode 100644 index 000000000000..40569d024f37 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/accessory.dm @@ -0,0 +1,8 @@ +/datum/gear/donator/accessory + slot = ITEM_SLOT_ACCESSORY + handle_post_equip = TRUE + +/datum/gear/donator/accessory/kiaramedal + name = "Insignia of Steele" + path = /obj/item/clothing/accessory/medal/steele + ckeywhitelist = list("inferno707") diff --git a/modular_citadel/code/modules/client/loadout/donator/backpack.dm b/modular_citadel/code/modules/client/loadout/donator/backpack.dm new file mode 100644 index 000000000000..71acdab12298 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/backpack.dm @@ -0,0 +1,153 @@ +/datum/gear/donator/backpack + handle_post_equip = TRUE + +/datum/gear/donator/backpack/pet + name = "Pet Beacon" + path = /obj/item/choice_beacon/pet + ckeywhitelist = list() + donator_group_id = DONATOR_GROUP_TIER_1 // can be accessed by all donators + +/datum/gear/donator/backpack/carpet + name = "Carpet Beacon" + path = /obj/item/choice_beacon/box/carpet + ckeywhitelist = list() + donator_group_id = DONATOR_GROUP_TIER_1 + +/datum/gear/donator/backpack/donortestingbikehorn + name = "Donor item testing bikehorn" + path = /obj/item/bikehorn + geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings + +/datum/gear/donator/backpack/kevhorn + name = "Airhorn" + path = /obj/item/bikehorn/airhorn + ckeywhitelist = list("kevinz000") + +/datum/gear/donator/backpack/treeplushie + name = "Christmas tree plushie" + path = /obj/item/toy/plush/tree + ckeywhitelist = list("illotafv") + +/datum/gear/donator/backpack/carrotplush + name = "Carrot plushie" + path = /obj/item/toy/plush/carrot + ckeywhitelist = list("improvedname") + +/datum/gear/donator/backpack/russianflask + name = "Russian flask" + path = /obj/item/reagent_containers/food/drinks/flask/russian + cost = 2 + ckeywhitelist = list("slomka") + +/datum/gear/donator/backpack/AM4B + name = "Foam Force AM4-B" + path = /obj/item/gun/ballistic/automatic/AM4B + ckeywhitelist = list("zeronetalpha") + +/datum/gear/donator/backpack/torisword + name = "Rainbow Zweihander" + path = /obj/item/dualsaber/hypereutactic/toy/rainbow + ckeywhitelist = list("annoymous35") + +/datum/gear/donator/backpack/darksabre + name = "Dark Sabre" + path = /obj/item/toy/darksabre + ckeywhitelist = list("inferno707") + +/datum/gear/donator/backpack/darksabresheath + name = "Dark Sabre Sheath" + path = /obj/item/storage/belt/sabre/darksabre + ckeywhitelist = list("inferno707") + +/datum/gear/donator/backpack/toriball + name = "Rainbow Tennis Ball" + path = /obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow + ckeywhitelist = list("annoymous35") + +/datum/gear/donator/backpack/izzyball + name = "Katlin's Ball" + path = /obj/item/toy/fluff/tennis_poly/tri/squeak/izzy + ckeywhitelist = list("izzyinbox") + +/datum/gear/donator/backpack/steelflask + name = "Steel Flask" + path = /obj/item/reagent_containers/food/drinks/flask/steel + cost = 2 + ckeywhitelist = list("nik707") + +/datum/gear/donator/backpack/cloakce + name = "Polychromic CE Cloak" + path = /obj/item/clothing/neck/cloak/polychromic/polyce + ckeywhitelist = list("worksbythesea", "blakeryan") + loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#808080", "#8CC6FF", "#FF3535") + +/datum/gear/donator/backpack/ssk + name = "Stun Sword Kit" + path = /obj/item/ssword_kit + ckeywhitelist = list("phillip458") + +/datum/gear/donator/backpack/techcoat + name = "Techomancers Labcoat" + path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat + ckeywhitelist = list("wilchen") + +/datum/gear/donator/backpack/leechjar + name = "Jar of Leeches" + path = /obj/item/custom/leechjar + ckeywhitelist = list("sgtryder") + +/datum/gear/donator/backpack/darkarmor + name = "Dark Armor" + path = /obj/item/clothing/suit/armor/vest/darkcarapace + ckeywhitelist = list("inferno707") + +/datum/gear/donator/backpack/flagcape + name = "US Flag Cape" + path = /obj/item/clothing/neck/flagcape + ckeywhitelist = list("darnchacha") + +/datum/gear/donator/backpack/luckyjack + name = "Lucky Jackboots" + path = /obj/item/clothing/shoes/lucky + ckeywhitelist = list("spiralwithin") + +/datum/gear/donator/backpack/m41 + name = "Toy M41" + path = /obj/item/toy/gun/m41 + ckeywhitelist = list("thalverscholen") + +/datum/gear/donator/backpack/fritzplush + name = "Fritz Plushie" + path = /obj/item/toy/plush/mammal/dog/fritz + ckeywhitelist = list("analwerewolf") + +/datum/gear/donator/backpack/borgplush + name = "Robot Plush" + path = /obj/item/toy/plush/borgplushie + ckeywhitelist = list("nicholaiavenicci") + +/datum/gear/donator/backpack/cosmos + name = "cosmic space bedsheet" + path = /obj/item/bedsheet/cosmos + ckeywhitelist = list("grunnyyy") + +/datum/gear/donator/backpack/customskirt + name = "custom atmos skirt" + path = /obj/item/clothing/under/custom/customskirt + ckeywhitelist = list("thakyz") + +/datum/gear/donator/backpack/strangemask + name = "Strange Metal Mask" + path = /obj/item/clothing/mask/breath/mmask + ckeywhitelist = list("sneka") + +/datum/gear/donator/backpack/mgasmask + name = "Military Gas Mask" + path = /obj/item/clothing/mask/gas/military + ckeywhitelist = list("unclebourbon") + +/datum/gear/donator/backpack/pokerchips + name = "pokerchip set" + path = /obj/item/storage/box/pockerchips + ckeywhitelist = list("greed2323") diff --git a/modular_citadel/code/modules/client/loadout/donator/gloves.dm b/modular_citadel/code/modules/client/loadout/donator/gloves.dm new file mode 100644 index 000000000000..6d020b706823 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/gloves.dm @@ -0,0 +1,12 @@ +/datum/gear/donator/gloves + slot = ITEM_SLOT_GLOVES + +/datum/gear/donator/gloves/longblackgloves + name = "Luna's Gauntlets" + path = /obj/item/clothing/gloves/longblackgloves + ckeywhitelist = list("bigmanclancy") + +/datum/gear/donator/gloves/mikugloves + name = "starlight singer gloves" + path = /obj/item/clothing/gloves/mikugloves + ckeywhitelist = list("grandvegeta") diff --git a/modular_citadel/code/modules/client/loadout/donator/hands.dm b/modular_citadel/code/modules/client/loadout/donator/hands.dm new file mode 100644 index 000000000000..c4c9ec7643d4 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/hands.dm @@ -0,0 +1,19 @@ +/datum/gear/donator/hands + slot = ITEM_SLOT_HANDS + +/datum/gear/donator/hands/engravedzippo + name = "Engraved zippo" + path = /obj/item/lighter/gold + ckeywhitelist = list("dirtyoldharry") + +/datum/gear/donator/hands/carrotsatchel + name = "Carrot Satchel" + path = /obj/item/storage/backpack/satchel/carrot + ckeywhitelist = list("improvedname") + +/datum/gear/donator/hands/raiqbawks + name = "Miami Boombox" + cost = 2 + path = /obj/item/boombox/raiq + ckeywhitelist = list("chefferz") + diff --git a/modular_citadel/code/modules/client/loadout/donator/head.dm b/modular_citadel/code/modules/client/loadout/donator/head.dm new file mode 100644 index 000000000000..623619a3f3ac --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/head.dm @@ -0,0 +1,42 @@ +/datum/gear/donator/head + slot = ITEM_SLOT_HEAD + +/datum/gear/donator/head/santahat + name = "Santa hat" + path = /obj/item/clothing/head/santa/fluff + ckeywhitelist = list("illotafv") + +/datum/gear/donator/head/reindeerhat + name = "Reindeer hat" + path = /obj/item/clothing/head/hardhat/reindeer/fluff + ckeywhitelist = list("illotafv") + +/datum/gear/donator/head/paperhat + name = "Paper Hat" + path = /obj/item/clothing/head/paperhat + ckeywhitelist = list("kered2") + +/datum/gear/donator/head/frenchberet + name = "French Beret" + path = /obj/item/clothing/head/frenchberet + ckeywhitelist = list("notazoltan") + +/datum/gear/donator/head/donorberet + name = "Atmos Beret" + path = /obj/item/clothing/head/blueberet + ckeywhitelist = list("foxystalin") + +/datum/gear/donator/head/donorgoggles + name = "Flight Goggles" + path = /obj/item/clothing/head/flight + ckeywhitelist = list("maxlynchy") + +/datum/gear/donator/head/mikuhair + name = "starlight singer hair" + path = /obj/item/clothing/head/mikuhair + ckeywhitelist = list("grandvegeta") + +/datum/gear/donator/head/hisakaki + name = "halo" + path = /obj/item/clothing/head/halo + ckeywhitelist = list("hisakaki") diff --git a/modular_citadel/code/modules/client/loadout/donator/mask.dm b/modular_citadel/code/modules/client/loadout/donator/mask.dm new file mode 100644 index 000000000000..8540c82e3d31 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/mask.dm @@ -0,0 +1,27 @@ +/datum/gear/donator/mask + slot = ITEM_SLOT_MASK + +/datum/gear/donator/mask/hheart + name = "The Hollow Heart" + path = /obj/item/clothing/mask/hheart + ckeywhitelist = list("inferno707") + +/datum/gear/donator/mask/albortorosamask + name = "Alborto Rosa mask" + path = /obj/item/clothing/mask/luchador/zigfie + ckeywhitelist = list("zigfie") + +/datum/gear/donator/mask/stalkermask + name = "S.T.A.L.K.E.R. mask" + path = /obj/item/clothing/mask/gas/stalker + ckeywhitelist = list("slomka") + +/datum/gear/donator/mask/mimemask + name = "Mime Mask" + path = /obj/item/clothing/mask/gas/mime + ckeywhitelist = list("pireamaineach") + +/datum/gear/donator/mask/clownmask + name = "Clown Mask" + path = /obj/item/clothing/mask/gas/clown_hat + ckeywhitelist = list("djkouta") diff --git a/modular_citadel/code/modules/client/loadout/donator/neck.dm b/modular_citadel/code/modules/client/loadout/donator/neck.dm new file mode 100644 index 000000000000..cb5359ea0828 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/neck.dm @@ -0,0 +1,78 @@ +/datum/gear/donator/neck + slot = ITEM_SLOT_NECK + +/datum/gear/donator/neck/chameleon_bedsheet + name = "Chameleon Bedsheet" + path = /obj/item/bedsheet/chameleon + ckeywhitelist = list() + donator_group_id = DONATOR_GROUP_TIER_1 + +/datum/gear/donator/neck/kiaracloak + name = "Kiara's cloak" + path = /obj/item/clothing/neck/cloak/inferno + ckeywhitelist = list("inferno707") + +/datum/gear/donator/neck/kiaracollar + name = "Kiara's collar" + path = /obj/item/clothing/neck/petcollar/inferno + ckeywhitelist = list("inferno707") + +/datum/gear/donator/neck/specialscarf + name = "Special scarf" + path = /obj/item/clothing/neck/scarf/zomb + ckeywhitelist = list("zombierobin") + +/datum/gear/donator/neck/treecloak + name = "Christmas tree cloak" + path = /obj/item/clothing/neck/cloak/festive + ckeywhitelist = list("illotafv") + +/datum/gear/donator/neck/carrotcloak + name = "Carrot cloak" + path = /obj/item/clothing/neck/cloak/carrot + ckeywhitelist = list("improvedname") + +/datum/gear/donator/neck/stripedcollar + name = "Striped collar" + path = /obj/item/clothing/neck/petcollar/stripe + ckeywhitelist = list("jademanique") + +/datum/gear/donator/neck/naomicollar + name = "worn pet collar" + path = /obj/item/clothing/neck/petcollar/naomi + ckeywhitelist = list("technicalmagi") + +/datum/gear/donator/neck/bloodredtie + name = "Blood Red Tie" + path = /obj/item/clothing/neck/tie/bloodred + ckeywhitelist = list("kyutness") + +/datum/gear/donator/neck/cloak + name = "Green Cloak" + path = /obj/item/clothing/neck/cloak/green + ckeywhitelist = list("killer402402") + +/datum/gear/donator/neck/devilwings + name = "Strange Wings" + path = /obj/item/clothing/neck/devilwings + ckeywhitelist = list("kitsun") + +/datum/gear/donator/neck/soulneck + name = "Soul Necklace" + path = /obj/item/clothing/neck/undertale + ckeywhitelist = list("twilightic") + +/datum/gear/donator/neck/csheet + name = "NT Bedsheet" + path = /obj/item/bedsheet/captain + ckeywhitelist = list("tikibomb") + +/datum/gear/donator/neck/onionneck + name = "Onion Necklace" + path = /obj/item/clothing/neck/necklace/onion + ckeywhitelist = list("cdrcross") + +/datum/gear/donator/neck/choker + name = "NT Choker" + path = /obj/item/clothing/neck/petcollar/donorchoker + ckeywhitelist = list("trigillass") diff --git a/modular_citadel/code/modules/client/loadout/donator/shoes.dm b/modular_citadel/code/modules/client/loadout/donator/shoes.dm new file mode 100644 index 000000000000..003599572dd8 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/shoes.dm @@ -0,0 +1,12 @@ +/datum/gear/donator/shoes + slot = ITEM_SLOT_FEET + +/datum/gear/donator/shoes/pinkshoes + name = "Pink shoes" + path = /obj/item/clothing/shoes/sneakers/pink + ckeywhitelist = list("zigfie") + +/datum/gear/donator/shoes/mikuleggings + name = "starlight singer leggings" + path = /obj/item/clothing/shoes/sneakers/mikuleggings + ckeywhitelist = list("grandvegeta") diff --git a/modular_citadel/code/modules/client/loadout/donator/suit.dm b/modular_citadel/code/modules/client/loadout/donator/suit.dm new file mode 100644 index 000000000000..d0ffd6ba6c53 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/suit.dm @@ -0,0 +1,87 @@ +/datum/gear/donator/suit + slot = ITEM_SLOT_OCLOTHING + +/datum/gear/donator/suit/redmadcoat + name = "The Mad's labcoat" + path = /obj/item/clothing/suit/toggle/labcoat/mad/red + ckeywhitelist = list("zombierobin") + +/datum/gear/donator/suit/santaoutfit + name = "Santa costume" + path = /obj/item/clothing/suit/space/santa/fluff + ckeywhitelist = list("illotafv") + +/datum/gear/donator/suit/reecesgreatcoat + name = "Reece's Great Coat" + path = /obj/item/clothing/suit/trenchcoat/green + ckeywhitelist = list("geemiesif") + +/datum/gear/donator/suit/gladiator + name = "Gladiator Armor" + path = /obj/item/clothing/under/costume/gladiator + ckeywhitelist = list("aroche") + +/datum/gear/donator/suit/puffydress + name = "Puffy Dress" + path = /obj/item/clothing/suit/puffydress + ckeywhitelist = list("stallingratt") + +/datum/gear/donator/suit/labredblack + name = "Black and Red Coat" + path = /obj/item/clothing/suit/toggle/labcoat/labredblack + ckeywhitelist = list("blakeryan", "durandalphor") + +/datum/gear/donator/suit/gothcoat + name = "Goth Coat" + path = /obj/item/clothing/suit/gothcoat + ckeywhitelist = list("norko") + +/datum/gear/donator/suit/corgisuit + name = "Corgi Suit" + path = /obj/item/clothing/suit/hooded/ian_costume + ckeywhitelist = list("cathodetherobot") + +/datum/gear/donator/suit/sharkcloth + name = "Leon's Skimpy Outfit" + path = /obj/item/clothing/under/custom/leoskimpy + ckeywhitelist = list("spectrosis") + +/datum/gear/donator/suit/mimeoveralls + name = "Mime's Overalls" + path = /obj/item/clothing/under/custom/mimeoveralls + ckeywhitelist = list("pireamaineach") + +/datum/gear/donator/suit/zuliecloak + name = "Project: Zul-E" + path = /obj/item/clothing/suit/hooded/cloak/zuliecloak + ckeywhitelist = list("asky") + +/datum/gear/donator/suit/blackredgold + name = "Black, Red, and Gold Coat" + path = /obj/item/clothing/suit/blackredgold + ckeywhitelist = list("ttbnc") + +/datum/gear/donator/suit/kimono + name = "Kimono" + path = /obj/item/clothing/suit/kimono + ckeywhitelist = list("sfox63") + +/datum/gear/donator/suit/commjacket + name = "Dusty Commisar's Cloak" + path = /obj/item/clothing/suit/commjacket + ckeywhitelist = list("sadisticbatter") + +/datum/gear/donator/suit/mikujacket + name = "starlight singer jacket" + path = /obj/item/clothing/suit/mikujacket + ckeywhitelist = list("grandvegeta") + +/datum/gear/donator/suit/exo + name = "exo frame" + path = /obj/item/clothing/suit/custom/exo + ckeywhitelist = list("jesterz7") + +/datum/gear/donator/suit/spacehoodie + name = "Space Hoodie" + path = /obj/item/clothing/suit/spacehoodie + ckeywhitelist = list("bidlink2") diff --git a/modular_citadel/code/modules/client/loadout/donator/uniform.dm b/modular_citadel/code/modules/client/loadout/donator/uniform.dm new file mode 100644 index 000000000000..11f6ee517ee1 --- /dev/null +++ b/modular_citadel/code/modules/client/loadout/donator/uniform.dm @@ -0,0 +1,68 @@ +/datum/gear/donator/uniform + slot = ITEM_SLOT_ICLOTHING + +/datum/gear/donator/uniform/geisha + name = "Geisha suit" + path = /obj/item/clothing/under/costume/geisha + ckeywhitelist = list("atiefling") + +/datum/gear/donator/uniform/mankini + name = "Mankini" + path = /obj/item/clothing/under/misc/stripper/mankini + ckeywhitelist = list("zigfie") + +/datum/gear/donator/uniform/performersoutfit + name = "Bluish performer's outfit" + path = /obj/item/clothing/under/costume/singer/yellow/custom + ckeywhitelist = list("killer402402") + +/datum/gear/donator/uniform/vermillion + name = "Vermillion clothing" + path = /obj/item/clothing/suit/vermillion + ckeywhitelist = list("fractious") + +/datum/gear/donator/uniform/naomisweater + name = "worn black sweater" + path = /obj/item/clothing/under/sweater/black/naomi + ckeywhitelist = list("technicalmagi") + +/datum/gear/donator/uniform/Divine_robes + name = "Divine robes" + path = /obj/item/clothing/under/custom/lunasune + ckeywhitelist = list("invader4352") + +/datum/gear/donator/uniform/mw2_russian_para + name = "Russian Paratrooper Jumper" + path = /obj/item/clothing/under/custom/mw2_russian_para + ckeywhitelist = list("investigator77") + +/datum/gear/donator/uniform/trendy_fit + name = "Trendy Fit" + path = /obj/item/clothing/under/custom/trendy_fit + ckeywhitelist = list("midgetdragon") + +/datum/gear/donator/uniform/singery + name = "Yellow Performer Outfit" + path = /obj/item/clothing/under/costume/singer/yellow + ckeywhitelist = list("maxlynchy") + +/datum/gear/donator/uniform/mikubikini + name = "starlight singer bikini" + path = /obj/item/clothing/under/custom/mikubikini + ckeywhitelist = list("grandvegeta") + +/datum/gear/donator/uniform/vest + name = "vest and shirt" + path = /obj/item/clothing/under/custom/vest + ckeywhitelist = list("maylowfox") + +/datum/gear/donator/uniform/smaiden + name = "shrine maiden outfit" + path = /obj/item/clothing/under/smaiden + ckeywhitelist = list("ultimarifox") + +/datum/gear/donator/uniform/psychedelicjumpsuit + name = "psychedelic jumpsuit" + path = /obj/item/clothing/under/misc/psyche + ckeywhitelist = list("commandnotrecognized") + diff --git a/tgstation.dme b/tgstation.dme index 76365725ad66..dac9db26ee6f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3927,6 +3927,14 @@ #include "modular_citadel\code\modules\client\loadout\suit.dm" #include "modular_citadel\code\modules\client\loadout\uniform.dm" #include "modular_citadel\code\modules\client\loadout\unlockable.dm" +#include "modular_citadel\code\modules\client\loadout\donator\accessory.dm" +#include "modular_citadel\code\modules\client\loadout\donator\backpack.dm" +#include "modular_citadel\code\modules\client\loadout\donator\gloves.dm" +#include "modular_citadel\code\modules\client\loadout\donator\mask.dm" +#include "modular_citadel\code\modules\client\loadout\donator\neck.dm" +#include "modular_citadel\code\modules\client\loadout\donator\shoes.dm" +#include "modular_citadel\code\modules\client\loadout\donator\suit.dm" +#include "modular_citadel\code\modules\client\loadout\donator\uniform.dm" #include "modular_citadel\code\modules\client\verbs\who.dm" #include "modular_citadel\code\modules\clothing\neck.dm" #include "modular_citadel\code\modules\clothing\trek.dm"
" - dat += "Preview:" + dat += "" + dat += "
Preview:

" + dat += "
" dat += "[PREVIEW_PREF_JOB]" dat += "[PREVIEW_PREF_LOADOUT]" dat += "[PREVIEW_PREF_NAKED]" + dat += "[PREVIEW_PREF_NAKED_AROUSED]" + dat += "
" dat += "		" - dat += "[gear_points] loadout point[gear_points == 1 ? "" : "s"] remaining Clear Loadout" + dat += "" + dat += "
[gear_points] loadout point[gear_points == 1 ? "" : "s"] remaining

" + dat += "
Clear Loadout
" dat += "		" - dat += "Mismatched parts: [(show_mismatched_markings) ? "Enabled" : "Disabled"]" + dat += "" + dat += "
Mismatched parts:

" + dat += "
[(show_mismatched_markings) ? "Enabled" : "Disabled"]
" dat += "		" - dat += " Advanced colors: [(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) ? "Enabled" : "Disabled"]" + dat += "" + dat += "
Advanced colors:

" + dat += "
[(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) ? "Enabled" : "Disabled"]
" dat += "