From 3be6732cfc1cc0969edcb655748fc4da4a0de7fc Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 02:56:35 -0600 Subject: [PATCH 01/14] its peak --- code/modules/loadout/categories/heads.dm | 8 +- code/modules/loadout/categories/pocket.dm | 12 +- .../categories/backpacks.dm | 12 + .../loadout_categories/categories/belts.dm | 50 +--- .../loadout_categories/categories/clothing.dm | 278 ++---------------- .../loadout_categories/categories/glasses.dm | 12 +- .../loadout_categories/categories/gloves.dm | 12 + .../loadout_categories/categories/heads.dm | 50 ++-- .../loadout_categories/categories/inhands.dm | 24 +- .../loadout_categories/categories/masks.dm | 16 +- .../loadout_categories/categories/neck.dm | 8 + .../loadout_categories/categories/pockets.dm | 116 ++++---- .../loadout_categories/categories/shoes.dm | 28 +- .../categories/undersuit.dm | 98 +++--- .../code/hats/doppler_command_hats.dm | 18 +- .../code/neck/doppler_command_mantles.dm | 15 +- .../icons/mob/head/doppler_command_hats.dmi | Bin 2271 -> 2538 bytes .../icons/mob/neck/doppler_mantles.dmi | Bin 2454 -> 2584 bytes .../icons/obj/head/doppler_command_hats.dmi | Bin 1503 -> 1580 bytes .../icons/obj/neck/doppler_mantles.dmi | Bin 1057 -> 1121 bytes 20 files changed, 263 insertions(+), 494 deletions(-) diff --git a/code/modules/loadout/categories/heads.dm b/code/modules/loadout/categories/heads.dm index 69ef68cfff193..8fd2c268c1105 100644 --- a/code/modules/loadout/categories/heads.dm +++ b/code/modules/loadout/categories/heads.dm @@ -72,9 +72,9 @@ name = "Cap (Yellow)" item_path = /obj/item/clothing/head/soft/yellow -/datum/loadout_item/head/flatcap +/* /datum/loadout_item/head/flatcap // DOPPLER EDIT REMOVAL name = "Cap (Flat)" - item_path = /obj/item/clothing/head/flatcap + item_path = /obj/item/clothing/head/flatcap */ /datum/loadout_item/head/beige_fedora name = "Fedora (Beige)" @@ -124,7 +124,7 @@ name ="Ushanka" item_path = /obj/item/clothing/head/costume/ushanka -/datum/loadout_item/head/plague_doctor +/* /datum/loadout_item/head/plague_doctor // DOPPLER EDIT REMOVAL name = "Cap (Plague Doctor)" item_path = /obj/item/clothing/head/bio_hood/plague @@ -150,7 +150,7 @@ /datum/loadout_item/head/harebell name = "Harebell" - item_path = /obj/item/food/grown/harebell + item_path = /obj/item/food/grown/harebell */ /datum/loadout_item/head/wig name = "Wig" diff --git a/code/modules/loadout/categories/pocket.dm b/code/modules/loadout/categories/pocket.dm index b9a03e2068dd4..cc653b33de250 100644 --- a/code/modules/loadout/categories/pocket.dm +++ b/code/modules/loadout/categories/pocket.dm @@ -43,7 +43,7 @@ return ..() -/datum/loadout_item/pocket_items/lipstick_black +/* /datum/loadout_item/pocket_items/lipstick_black // DOPPLER EDIT REMOVAL name = "Lipstick (Black)" item_path = /obj/item/lipstick/black additional_displayed_text = list("Black") @@ -78,13 +78,13 @@ /datum/loadout_item/pocket_items/lipstick_white name = "Lipstick (White)" item_path = /obj/item/lipstick/white - additional_displayed_text = list("White") + additional_displayed_text = list("White") */ /datum/loadout_item/pocket_items/plush abstract_type = /datum/loadout_item/pocket_items/plush can_be_named = TRUE -/datum/loadout_item/pocket_items/plush/bee +/* /datum/loadout_item/pocket_items/plush/bee // DOPPLER EDIT REMOVAL name = "Plush (Bee)" item_path = /obj/item/toy/plush/beeplushie @@ -124,7 +124,7 @@ /datum/loadout_item/pocket_items/plush/snake name = "Plush (Snake)" - item_path = /obj/item/toy/plush/snakeplushie + item_path = /obj/item/toy/plush/snakeplushie */ /datum/loadout_item/pocket_items/card_binder name = "Card Binder" @@ -146,7 +146,7 @@ name = "Dice Bag" item_path = /obj/item/storage/dice -/datum/loadout_item/pocket_items/d1 +/* /datum/loadout_item/pocket_items/d1 // DOPPLER EDIT REMOVAL name = "D1" item_path = /obj/item/dice/d1 @@ -192,4 +192,4 @@ /datum/loadout_item/pocket_items/d00 name = "D00" - item_path = /obj/item/dice/d00 + item_path = /obj/item/dice/d00 */ diff --git a/modular_doppler/loadout_categories/categories/backpacks.dm b/modular_doppler/loadout_categories/categories/backpacks.dm index 30222bab376d3..707409891c274 100644 --- a/modular_doppler/loadout_categories/categories/backpacks.dm +++ b/modular_doppler/loadout_categories/categories/backpacks.dm @@ -53,3 +53,15 @@ /datum/loadout_item/backpack/messenger/industrial name = "Custom Industrial Messenger Bag" item_path = /obj/item/storage/backpack/messenger/eng/custom + +/datum/loadout_item/backpack/frontier + name = "Frontier Backpack" + item_path = /obj/item/storage/backpack/industrial/frontier_colonist + +/datum/loadout_item/backpack/frontier_messenger + name = "Frontier Messenger Bag" + item_path = /obj/item/storage/backpack/industrial/frontier_colonist/messenger + +/datum/loadout_item/backpack/frontier_satchel + name = "Frontier Satchel" + item_path = /obj/item/storage/backpack/industrial/frontier_colonist/satchel diff --git a/modular_doppler/loadout_categories/categories/belts.dm b/modular_doppler/loadout_categories/categories/belts.dm index 38694c991b551..8512e23d83cc6 100644 --- a/modular_doppler/loadout_categories/categories/belts.dm +++ b/modular_doppler/loadout_categories/categories/belts.dm @@ -21,42 +21,6 @@ name = "Black Fannypack" item_path = /obj/item/storage/belt/fannypack/black -/datum/loadout_item/belts/fanny_pack_blue - name = "Blue Fannypack" - item_path = /obj/item/storage/belt/fannypack/blue - -/datum/loadout_item/belts/fanny_pack_brown - name = "Brown Fannypack" - item_path = /obj/item/storage/belt/fannypack - -/datum/loadout_item/belts/fanny_pack_cyan - name = "Cyan Fannypack" - item_path = /obj/item/storage/belt/fannypack/cyan - -/datum/loadout_item/belts/fanny_pack_green - name = "Green Fannypack" - item_path = /obj/item/storage/belt/fannypack/green - -/datum/loadout_item/belts/fanny_pack_orange - name = "Orange Fannypack" - item_path = /obj/item/storage/belt/fannypack/orange - -/datum/loadout_item/belts/fanny_pack_pink - name = "Pink Fannypack" - item_path = /obj/item/storage/belt/fannypack/pink - -/datum/loadout_item/belts/fanny_pack_purple - name = "Purple Fannypack" - item_path = /obj/item/storage/belt/fannypack/purple - -/datum/loadout_item/belts/fanny_pack_red - name = "Red Fannypack" - item_path = /obj/item/storage/belt/fannypack/red - -/datum/loadout_item/belts/fanny_pack_yellow - name = "Yellow Fannypack" - item_path = /obj/item/storage/belt/fannypack/yellow - /datum/loadout_item/belts/fanny_pack_white name = "White Fannypack" item_path = /obj/item/storage/belt/fannypack/white @@ -69,10 +33,6 @@ name = "Lantern" item_path = /obj/item/flashlight/lantern -/datum/loadout_item/belts/candle_box - name = "Candle Box" - item_path = /obj/item/storage/fancy/candle_box - /datum/loadout_item/belts/champion name = "Champion's Belt" item_path = /obj/item/storage/belt/champion @@ -105,14 +65,14 @@ name = "Compact Utility Belt" item_path = /obj/item/storage/belt/utility/invisible -/datum/loadout_item/belts/utility/chief - name = "Chief Engineer's Utility Belt" - item_path = /obj/item/storage/belt/utility/chief - /datum/loadout_item/belts/mining name = "Explorer's Webbing" item_path = /obj/item/storage/belt/mining +/datum/loadout_item/belts/mining + name = "Explorer's Webbing (Alt)" + item_path = /obj/item/storage/belt/mining/alt + /datum/loadout_item/belts/boarding_rig name = "Chest Rig" item_path = /obj/item/storage/belt/military @@ -130,7 +90,7 @@ item_path = /obj/item/storage/medkit/frontier/stocked /datum/loadout_item/belts/deforest_surgical - name = "Firest Responder Med-kit" + name = "First Responder Med-kit" item_path = /obj/item/storage/backpack/duffelbag/deforest_surgical /datum/loadout_item/belts/crusader_belt diff --git a/modular_doppler/loadout_categories/categories/clothing.dm b/modular_doppler/loadout_categories/categories/clothing.dm index e8ef6ae501fde..d7054e71faf4f 100644 --- a/modular_doppler/loadout_categories/categories/clothing.dm +++ b/modular_doppler/loadout_categories/categories/clothing.dm @@ -55,6 +55,30 @@ * SUITS / SUIT JACKETS */ +/datum/loadout_item/suit/detective_black + name = "Noir Trenchcoat" + item_path = /obj/item/clothing/suit/jacket/det_suit/dark + +/datum/loadout_item/suit/detective_black_short + name = "Noir Suit Jacket" + item_path = /obj/item/clothing/suit/jacket/det_suit/noir + +/datum/loadout_item/suit/detective_brown + name = "Trenchcoat" + item_path = /obj/item/clothing/suit/jacket/det_suit + +/datum/loadout_item/suit/detective_brown_short + name = "Brown Suit Jacket" + item_path = /obj/item/clothing/suit/jacket/det_suit/brown + +/datum/loadout_item/suit/its_pronounced_stow_ic_not_stoike + name = "Disco Blazer" + item_path = /obj/item/clothing/suit/jacket/det_suit/disco + +/datum/loadout_item/suit/kim_possible + name = "Aerostatic Bomber Jacket" + item_path = /obj/item/clothing/suit/jacket/det_suit/kim + /datum/loadout_item/suit/recolorable name = "Recolorable Formal Suit Jacket" item_path = /obj/item/clothing/suit/toggle/lawyer/greyscale @@ -87,14 +111,6 @@ name = "Recolorable Suspenders" item_path = /obj/item/clothing/suit/toggle/suspenders -/* -* DRESSES -*/ - -/datum/loadout_item/suit/white_dress - name = "White Dress" - item_path = /obj/item/clothing/suit/costume/whitedress - /* * LABCOATS */ @@ -111,22 +127,6 @@ name = "Sleeveless Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/lalunevest -/* -* PONCHOS -*/ - -/datum/loadout_item/suit/poncho - name = "Poncho" - item_path = /obj/item/clothing/suit/costume/poncho - -/datum/loadout_item/suit/poncho_green - name = "Green Poncho" - item_path = /obj/item/clothing/suit/costume/poncho/green - -/datum/loadout_item/suit/poncho_red - name = "Red Poncho" - item_path = /obj/item/clothing/suit/costume/poncho/red - /* * JACKETS */ @@ -191,74 +191,6 @@ name = "Leather Jacket with Hoodie" item_path = /obj/item/clothing/suit/hooded/doppler/leather_hoodie -/* -* COSTUMES -*/ - -/datum/loadout_item/suit/owl - name = "Owl Cloak" - item_path = /obj/item/clothing/suit/toggle/owlwings - -/datum/loadout_item/suit/griffin - name = "Griffon Cloak" - item_path = /obj/item/clothing/suit/toggle/owlwings/griffinwings - -/datum/loadout_item/suit/syndi - name = "Black And Red Space Suit Replica" - item_path = /obj/item/clothing/suit/syndicatefake - -/datum/loadout_item/suit/bee - name = "Bee Outfit" - item_path = /obj/item/clothing/suit/hooded/bee_costume - -/datum/loadout_item/suit/plague_doctor - name = "Plague Doctor Suit" - item_path = /obj/item/clothing/suit/bio_suit/plaguedoctorsuit - -/datum/loadout_item/suit/snowman - name = "Snowman Outfit" - item_path = /obj/item/clothing/suit/costume/snowman - -/datum/loadout_item/suit/chicken - name = "Chicken Suit" - item_path = /obj/item/clothing/suit/costume/chickensuit - -/datum/loadout_item/suit/monkey - name = "Monkey Suit" - item_path = /obj/item/clothing/suit/costume/monkeysuit - -/datum/loadout_item/suit/cardborg - name = "Cardborg Suit" - item_path = /obj/item/clothing/suit/costume/cardborg - -/datum/loadout_item/suit/xenos - name = "Xenos Suit" - item_path = /obj/item/clothing/suit/costume/xenos - -/datum/loadout_item/suit/ian_costume - name = "Corgi Costume" - item_path = /obj/item/clothing/suit/hooded/ian_costume - -/datum/loadout_item/suit/carp_costume - name = "Carp Costume" - item_path = /obj/item/clothing/suit/hooded/carp_costume - -/datum/loadout_item/suit/shark_costume - name = "Shark Costume" - item_path = /obj/item/clothing/suit/hooded/shark_costume - -/datum/loadout_item/suit/shork_costume - name = "Shork Costume" - item_path = /obj/item/clothing/suit/hooded/shork_costume - -/datum/loadout_item/suit/wizard - name = "Wizard Robe" - item_path = /obj/item/clothing/suit/wizrobe/fake - -/datum/loadout_item/suit/witch - name = "Witch Robe" - item_path = /obj/item/clothing/suit/wizrobe/marisa/fake - /* * COLONIST */ @@ -331,143 +263,13 @@ name = "Hawaiian Shirt" item_path = /obj/item/clothing/suit/costume/hawaiian -/* -* MISC -*/ - -/datum/loadout_item/suit/frontierjacket - abstract_type = /datum/loadout_item/suit/frontierjacket - /* * HOODIES */ + /datum/loadout_item/suit/hoodie abstract_type = /datum/loadout_item/suit/hoodie -/* -* JOB-LOCKED -*/ - -// WINTER COATS -/datum/loadout_item/suit/coat_med - name = "Medical Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/medical - -/datum/loadout_item/suit/coat_paramedic - name = "Paramedic Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic - -/datum/loadout_item/suit/coat_robotics - name = "Robotics Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/science/robotics - -/datum/loadout_item/suit/coat_sci - name = "Science Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/science - -/datum/loadout_item/suit/coat_eng - name = "Engineering Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/engineering - -/datum/loadout_item/suit/coat_atmos - name = "Atmospherics Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos - -/datum/loadout_item/suit/coat_hydro - name = "Hydroponics Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/hydro - -/datum/loadout_item/suit/coat_cargo - name = "Cargo Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/cargo - -/datum/loadout_item/suit/coat_miner - name = "Mining Winter Coat" - item_path = /obj/item/clothing/suit/hooded/wintercoat/miner - -// JACKETS -/datum/loadout_item/suit/navybluejacketofficer - name = "Security Officer's Navy Blue Formal Jacket" - item_path = /obj/item/clothing/suit/jacket/officer/blue - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY) - -/datum/loadout_item/suit/navybluejacketwarden - name = "Warden's Navy Blue Formal Jacket" - item_path = /obj/item/clothing/suit/jacket/warden/blue - restricted_roles = list(JOB_WARDEN) - -/datum/loadout_item/suit/navybluejackethos - name = "Head of Security's Navy Blue Formal Jacket" - item_path = /obj/item/clothing/suit/jacket/hos/blue - restricted_roles = list(JOB_HEAD_OF_SECURITY) - -/datum/loadout_item/suit/qm_jacket - name = "Quartermaster's Overcoat" - item_path = /obj/item/clothing/suit/jacket/quartermaster - restricted_roles = list(JOB_QUARTERMASTER) - -/datum/loadout_item/suit/departmental_jacket - name = "Work Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket - -/datum/loadout_item/suit/engi_dep_jacket - name = "Engineering Department Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/engi - restricted_roles = list( - JOB_CHIEF_ENGINEER, - JOB_STATION_ENGINEER, - JOB_ATMOSPHERIC_TECHNICIAN, - ) - -/datum/loadout_item/suit/med_dep_jacket - name = "Medical Department Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/med - restricted_roles = list( - JOB_CHIEF_MEDICAL_OFFICER, - JOB_MEDICAL_DOCTOR, - JOB_CHEMIST, - JOB_PSYCHOLOGIST, - ) - -/datum/loadout_item/suit/cargo_dep_jacket - name = "Cargo Department Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/supply - restricted_roles = list( - JOB_QUARTERMASTER, - JOB_CARGO_TECHNICIAN, - JOB_SHAFT_MINER, - ) - -/datum/loadout_item/suit/sec_dep_jacket_blu - name = "Blue Security Department Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/sec - restricted_roles = list( - JOB_HEAD_OF_SECURITY, - JOB_SECURITY_OFFICER, - JOB_WARDEN, - JOB_DETECTIVE, - ) - -/datum/loadout_item/suit/sec_dep_jacket_red - name = "Red Security Department Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/sec/red - restricted_roles = list( - JOB_HEAD_OF_SECURITY, - JOB_SECURITY_OFFICER, - JOB_WARDEN, - JOB_DETECTIVE, - ) - -/datum/loadout_item/suit/sec_dep_jacket_red - name = "Security Medic Jacket" - item_path = /obj/item/clothing/suit/jacket/doppler/sec_medic - restricted_roles = list( - JOB_HEAD_OF_SECURITY, - JOB_SECURITY_OFFICER, - JOB_WARDEN, - JOB_DETECTIVE, - ) - /* * FAMILIES */ @@ -492,30 +294,6 @@ name = "Yuri Coat" item_path = /obj/item/clothing/suit/costume/yuri -/* -* CHAPLAIN -*/ - -/datum/loadout_item/suit/chap_nun - name = "Nun's Habit" - item_path = /obj/item/clothing/suit/chaplainsuit/nun - -/datum/loadout_item/suit/chap_holiday - name = "Chaplain's Holiday Robe" - item_path = /obj/item/clothing/suit/chaplainsuit/holidaypriest - -/datum/loadout_item/suit/chap_brownmonk - name = "Monk's Brown Habit" - item_path = /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit - -/datum/loadout_item/suit/chap_eastmonk - name = "Eastern Monk's Robe" - item_path = /obj/item/clothing/suit/chaplainsuit/monkrobeeast - -/datum/loadout_item/suit/chap_shrinehand - name = "Shrinehand Robe" - item_path = /obj/item/clothing/suit/chaplainsuit/shrinehand - -/datum/loadout_item/suit/chap_blackmonk - name = "Monk's Black Habit" - item_path = /obj/item/clothing/suit/chaplainsuit/habit +/datum/loadout_item/suit/mantella + name = "Mothic Mantella" + item_path = /obj/item/clothing/suit/mothcoat/winter diff --git a/modular_doppler/loadout_categories/categories/glasses.dm b/modular_doppler/loadout_categories/categories/glasses.dm index ca4fe95fac706..d63e1d99821c2 100644 --- a/modular_doppler/loadout_categories/categories/glasses.dm +++ b/modular_doppler/loadout_categories/categories/glasses.dm @@ -1,7 +1,3 @@ -/datum/loadout_item/glasses/monocle - name = "Monocle" - item_path = /obj/item/clothing/glasses/monocle - /datum/loadout_item/glasses/welding name = "Welding Goggles" item_path = /obj/item/clothing/glasses/welding @@ -13,3 +9,11 @@ /datum/loadout_item/glasses/eyewrap name = "Eyepatch Wrap" item_path = /obj/item/clothing/glasses/eyepatch/wrap + +/datum/loadout_item/glasses/binoclard + name = "Binoclard Lenses" + item_path = /obj/item/clothing/glasses/regular/kim + +/datum/loadout_item/glasses/fake_blindfold + name = "Fake Blindfold" + item_path = /obj/item/clothing/glasses/trickblindfold diff --git a/modular_doppler/loadout_categories/categories/gloves.dm b/modular_doppler/loadout_categories/categories/gloves.dm index b34943287a98f..45b68c4d61efa 100644 --- a/modular_doppler/loadout_categories/categories/gloves.dm +++ b/modular_doppler/loadout_categories/categories/gloves.dm @@ -68,6 +68,10 @@ name = "Latex Gloves" item_path = /obj/item/clothing/gloves/latex +/datum/loadout_item/gloves/nitrile + name = "Nitrile Gloves" + item_path = /obj/item/clothing/gloves/latex/nitrile + /datum/loadout_item/gloves/translationgloves name = "Translation Gloves" item_path = /obj/item/clothing/gloves/radio @@ -83,3 +87,11 @@ /datum/loadout_item/gloves/cloth_armwraps name = "Cloth Armwraps" item_path = /obj/item/clothing/gloves/bracer/wraps + +/datum/loadout_item/gloves/frontier_gloves + name = "Frontier Gloves" + item_path = /obj/item/clothing/gloves/frontier_colonist + +/datum/loadout_item/gloves/aerostatic + name = "Aerostatic Gloves" + item_path = /obj/item/clothing/gloves/kim diff --git a/modular_doppler/loadout_categories/categories/heads.dm b/modular_doppler/loadout_categories/categories/heads.dm index e7e8a83ebfce6..37c795b84dfde 100644 --- a/modular_doppler/loadout_categories/categories/heads.dm +++ b/modular_doppler/loadout_categories/categories/heads.dm @@ -1,43 +1,19 @@ -/datum/loadout_item/head/chicken - name = "Chicken Hat" - item_path = /obj/item/clothing/head/costume/chicken - -/datum/loadout_item/head/griffin - name = "Griffin Hat" - item_path = /obj/item/clothing/head/costume/griffin - /datum/loadout_item/head/tv_head name = "TV Head" item_path = /obj/item/clothing/head/costume/tv_head -/datum/loadout_item/head/wizard - name = "Wizard Hat" - item_path = /obj/item/clothing/head/wizard/fake - /datum/loadout_item/head/witch name = "Witch Hat" item_path = /obj/item/clothing/head/wizard/marisa/fake -/datum/loadout_item/head/wig_random - name = "Random Wig" - item_path = /obj/item/clothing/head/wig/random - /datum/loadout_item/head/cardborg name = "Cardborg" item_path = /obj/item/clothing/head/costume/cardborg -/datum/loadout_item/head/pirate - name = "Pirate Hat" - item_path = /obj/item/clothing/head/costume/pirate - /datum/loadout_item/head/cone - name = "Cone Hat" + name = "Traffic Cone" item_path = /obj/item/clothing/head/cone -/datum/loadout_item/head/party - name = "Party Hat" - item_path = /obj/item/clothing/head/costume/party - /datum/loadout_item/head/rice_hat name = "Rice Hat" item_path = /obj/item/clothing/head/costume/rice_hat @@ -101,3 +77,27 @@ /datum/loadout_item/head/maid_headband name = "Maid Headband" item_path = /obj/item/clothing/head/maid_headband + +/datum/loadout_item/head/the_hood + name = "Standalone Hood" + item_path = /obj/item/clothing/head/standalone_hood + +/datum/loadout_item/head/decker_headphones + name = "Decker Headphones" + item_path = /obj/item/clothing/head/costume/deckers + +/datum/loadout_item/head/slim_beret + name = "slim Beret" + item_path = /obj/item/clothing/head/beret/doppler_command + +/datum/loadout_item/head/slim_beret_light + name = "Slim Beret (Light)" + item_path = /obj/item/clothing/head/beret/doppler_command/light + +/datum/loadout_item/head/hardhat_black + name = "Heavy-Duty Hardhat" + item_path = /obj/item/clothing/head/utility/hardhat/welding/doppler_command + +/datum/loadout_item/head/breach_helmet + name = "Breach Helmet" + item_path = /obj/item/clothing/head/utility/hardhat/welding/doppler_dc diff --git a/modular_doppler/loadout_categories/categories/inhands.dm b/modular_doppler/loadout_categories/categories/inhands.dm index 071c98ebc907d..e1d268fa068ff 100644 --- a/modular_doppler/loadout_categories/categories/inhands.dm +++ b/modular_doppler/loadout_categories/categories/inhands.dm @@ -11,21 +11,21 @@ name = "Mechanical Toolbox" item_path = /obj/item/storage/toolbox/mechanical -/datum/loadout_item/inhand/bouquet_mixed - name = "Mixed Bouquet" - item_path = /obj/item/bouquet +/datum/loadout_item/inhand/fishing_toolbox + name = "Fishing Toolbox" + item_path = /obj/item/storage/toolbox/fishing -/datum/loadout_item/inhand/bouquet_sunflower - name = "Sunflower Bouquet" - item_path = /obj/item/bouquet/sunflower +/datum/loadout_item/inhand/guncase + name = "Weapon Case" + item_path = /obj/item/storage/toolbox/guncase/modular/empty -/datum/loadout_item/inhand/bouquet_poppy - name = "Poppy Bouquet" - item_path = /obj/item/bouquet/poppy +/datum/loadout_item/inhand/yellow_guncase + name = "Yellow Weapon Case" + item_path = /obj/item/storage/toolbox/guncase/modular/carwo_large_case/empty -/datum/loadout_item/inhand/bouquet_rose - name = "Rose Bouquet" - item_path = /obj/item/bouquet/rose +/datum/loadout_item/inhand/fishing_toolbox + name = "Fishing Toolbox" + item_path = /obj/item/storage/toolbox/fishing /datum/loadout_item/inhand/slimpack name = "Custom Flatpack" diff --git a/modular_doppler/loadout_categories/categories/masks.dm b/modular_doppler/loadout_categories/categories/masks.dm index ee13834e60cb2..f17c5af84a5b4 100644 --- a/modular_doppler/loadout_categories/categories/masks.dm +++ b/modular_doppler/loadout_categories/categories/masks.dm @@ -28,10 +28,6 @@ name = "Gas Mask" item_path = /obj/item/clothing/mask/gas -/datum/loadout_item/mask/plaguedoctor - name = "Plague Doctor Mask" - item_path = /obj/item/clothing/mask/gas/plaguedoctor - /datum/loadout_item/mask/clown name = "Clown Mask" item_path = /obj/item/clothing/mask/gas/clown_hat @@ -64,10 +60,18 @@ name = "Frontier Gas Mask" item_path = /obj/item/clothing/mask/gas/atmos/frontier_colonist +/datum/loadout_item/mask/gas_cooler + name = "Alternate Gas Mask" + item_path = /obj/item/clothing/mask/gas/breach + /datum/loadout_item/mask/bandana name = "Bandana" item_path = /obj/item/clothing/mask/bandana +/datum/loadout_item/mask/bandana_stripe + name = "Bandana (Stripe)" + item_path = /obj/item/clothing/mask/bandana/striped + /datum/loadout_item/mask/bandana_skull name = "Bandana (Skull)" item_path = /obj/item/clothing/mask/bandana/skull @@ -80,10 +84,6 @@ name = "Paper Mask" item_path = /obj/item/clothing/mask/paper -/datum/loadout_item/mask/lollipop - name = "Lollipop" - item_path = /obj/item/food/lollipop - /datum/loadout_item/mask/kitsune name = "Kitsune Mask" item_path = /obj/item/clothing/mask/kitsune diff --git a/modular_doppler/loadout_categories/categories/neck.dm b/modular_doppler/loadout_categories/categories/neck.dm index 1dfa78c6261f7..12bd7f32ffe25 100644 --- a/modular_doppler/loadout_categories/categories/neck.dm +++ b/modular_doppler/loadout_categories/categories/neck.dm @@ -18,6 +18,14 @@ name = "Ranger Poncho" item_path = /obj/item/clothing/neck/ranger_poncho +/datum/loadout_item/neck/hazard_mantle + name = "Hazard Mantle" + item_path = /obj/item/clothing/neck/doppler_mantle + +/datum/loadout_item/neck/hazard_mantle_light + name = "Hazard Mantle (Light)" + item_path = /obj/item/clothing/neck/doppler_mantle/light + /datum/loadout_item/neck/face_scarf name = "Face Scarf" item_path = /obj/item/clothing/neck/face_scarf diff --git a/modular_doppler/loadout_categories/categories/pockets.dm b/modular_doppler/loadout_categories/categories/pockets.dm index 6f5e2f0211c85..33220d168ab87 100644 --- a/modular_doppler/loadout_categories/categories/pockets.dm +++ b/modular_doppler/loadout_categories/categories/pockets.dm @@ -64,37 +64,9 @@ name = "Pack of HP+ Gum" item_path = /obj/item/storage/box/gum/happiness -/* -* LIPSTICK -*/ - -/datum/loadout_item/pocket_items/lipstick_green - name = "Green Lipstick" - item_path = /obj/item/lipstick/green - -/datum/loadout_item/pocket_items/lipstick_white - name = "White Lipstick" - item_path = /obj/item/lipstick/white - -/datum/loadout_item/pocket_items/lipstick_blue - name = "Blue Lipstick" - item_path = /obj/item/lipstick/blue - -/datum/loadout_item/pocket_items/lipstick_black - name = "Black Lipstick" - item_path = /obj/item/lipstick/black - -/datum/loadout_item/pocket_items/lipstick_jade - name = "Jade Lipstick" - item_path = /obj/item/lipstick/jade - -/datum/loadout_item/pocket_items/lipstick_purple - name = "Purple Lipstick" - item_path = /obj/item/lipstick/purple - -/datum/loadout_item/pocket_items/lipstick_red - name = "Red Lipstick" - item_path = /obj/item/lipstick +/datum/loadout_item/pocket_items/gum_pack_moth + name = "Pack of Activin 12 Hour Medicated Gum" + item_path = /obj/item/storage/box/gum/wake_up /* * MISC @@ -104,13 +76,25 @@ name = "Rag" item_path = /obj/item/reagent_containers/cup/rag -/datum/loadout_item/pocket_items/razor - name = "Razor" - item_path = /obj/item/razor +/datum/loadout_item/pocket_items/london + name = "Switchblade" + item_path = /obj/item/switchblade + +/datum/loadout_item/pocket_items/london_two + name = "Survival Knife" + item_path = /obj/item/knife/combat/survival -/datum/loadout_item/pocket_items/matches - name = "Matchbox" - item_path = /obj/item/storage/box/matches +/datum/loadout_item/pocket_items/london_two + name = "Autoinjector Case" + item_path = /obj/item/storage/epic_loot_medpen_case + +/datum/loadout_item/pocket_items/london_two + name = "Documents Case" + item_path = /obj/item/storage/epic_loot_docs_case + +/datum/loadout_item/pocket_items/london_two + name = "Organizational Pouch" + item_path = /obj/item/storage/epic_loot_org_pouch /datum/loadout_item/pocket_items/cheaplighter name = "Cheap Lighter" @@ -120,10 +104,6 @@ name = "Zippo Lighter" item_path = /obj/item/lighter -/*/datum/loadout_item/pocket_items/ttsdevice //To be added - name = "Text-to-Speech Device" - item_path = /obj/item/ttsdevice*/ - /datum/loadout_item/pocket_items/paicard name = "Personal AI Device" item_path = /obj/item/pai_card @@ -180,14 +160,6 @@ name = "Mothic Rations Pack" item_path = /obj/item/storage/box/mothic_rations -/datum/loadout_item/pocket_items/cloth_ten - name = "Ten Cloth Sheets" - item_path = /obj/item/stack/sheet/cloth/ten - -/datum/loadout_item/pocket_items/medkit - name = "First-Aid Kit" - item_path = /obj/item/storage/medkit/regular - /datum/loadout_item/pocket_items/six_beer name = "Beer Six-Pack" item_path = /obj/item/storage/cans/sixbeer @@ -198,11 +170,11 @@ /datum/loadout_item/pocket_items/power_cell name = "Standard Power Cell" - item_path = /obj/item/stock_parts/power_store/cell + item_path = /obj/item/stock_parts/power_store/cell/crap /datum/loadout_item/pocket_items/soap name = "Bar of Soap" - item_path = /obj/item/soap + item_path = /obj/item/soap/deluxe /datum/loadout_item/pocket_items/mini_extinguisher name = "Mini Fire Extinguisher" @@ -212,25 +184,25 @@ name = "Pair of Binoculars" item_path = /obj/item/binoculars -/datum/loadout_item/pocket_items/drugs_happy - name = "Happy Pills" - item_path = /obj/item/storage/pill_bottle/happy +/datum/loadout_item/pocket_items/painkillers + name = "Amollin Pill Bottle" + item_path = /obj/item/storage/pill_bottle/painkiller -/datum/loadout_item/pocket_items/drugs_lsd - name = "Mindbreaker Pills" - item_path = /obj/item/storage/pill_bottle/lsd +/datum/loadout_item/pocket_items/drugs_happy + name = "Prescription Stimulant Bottle" + item_path = /obj/item/storage/pill_bottle/prescription_stimulant -/datum/loadout_item/pocket_items/drugs_weed - name = "Cannabis Seeds" - item_path = /obj/item/seeds/cannabis +/datum/loadout_item/pocket_items/drugs_blastoff + name = "bLaSToFF Ampoule" + item_path = /obj/item/reagent_containers/cup/blastoff_ampoule -/datum/loadout_item/pocket_items/drugs_reishi - name = "Reishi Seeds" - item_path = /obj/item/seeds/reishi +/datum/loadout_item/pocket_items/drugs_sandy + name = "T-WITCH Vial" + item_path = /obj/item/reagent_containers/hypospray/medipen/deforest/twitch -/datum/loadout_item/pocket_items/drugs_liberty - name = "Liberty Cap Seeds" - item_path = /obj/item/seeds/liberty +/datum/loadout_item/pocket_items/drugs_kronkus + name = "Kronkus Vine Seeds" + item_path = /obj/item/seeds/kronkus /* * MEDICAL @@ -239,3 +211,15 @@ /datum/loadout_item/pocket_items/civil_defense name = "Civil Defense Med-kit" item_path = /obj/item/storage/medkit/civil_defense/stocked + +/datum/loadout_item/pocket_items/medkit + name = "First-Aid Kit" + item_path = /obj/item/storage/medkit/regular + +/datum/loadout_item/pocket_items/pocket_medkit + name = "Colonial First Aid Kit" + item_path = /obj/item/storage/pouch/cin_medkit + +/datum/loadout_item/pocket_items/pocket_medpens_evil + name = "Colonial Medipen Pouch" + item_path = /obj/item/storage/pouch/cin_medipens diff --git a/modular_doppler/loadout_categories/categories/shoes.dm b/modular_doppler/loadout_categories/categories/shoes.dm index 389615c57040a..21f1d9a7dc265 100644 --- a/modular_doppler/loadout_categories/categories/shoes.dm +++ b/modular_doppler/loadout_categories/categories/shoes.dm @@ -71,10 +71,6 @@ name = "Jester Shoes" item_path = /obj/item/clothing/shoes/jester_shoes -/datum/loadout_item/shoes/ducky_shoes - name = "Ducky Shoes" - item_path = /obj/item/clothing/shoes/ducky_shoes - /datum/loadout_item/shoes/wheelys name = "Wheelys" item_path = /obj/item/clothing/shoes/wheelys @@ -87,10 +83,6 @@ name = "Lizard Cowboy Boots" item_path = /obj/item/clothing/shoes/cowboy/lizard -/datum/loadout_item/shoes/russian - name = "Russian Boots" - item_path = /obj/item/clothing/shoes/russian - /datum/loadout_item/shoes/pirate name = "Pirate Boots" item_path = /obj/item/clothing/shoes/pirate @@ -122,3 +114,23 @@ /datum/loadout_item/shoes/wraps/leggy name = "Cloth Legwraps" item_path = /obj/item/clothing/shoes/wraps/leggy + +/datum/loadout_item/shoes/wraps/aerostatic + name = "Aerostatic Boots" + item_path = /obj/item/clothing/shoes/kim + +/datum/loadout_item/shoes/wraps/disco + name = "Green Lizardskin Shoes" + item_path = /obj/item/clothing/shoes/discoshoes + +/datum/loadout_item/shoes/wraps/glow_shoes + name = "Glow Shoes" + item_path = /obj/item/clothing/shoes/glow + +/datum/loadout_item/shoes/wraps/swag + name = "Drip Shoes" + item_path = /obj/item/clothing/shoes/swagshoes + +/datum/loadout_item/shoes/wraps/skates + name = "Roller Skates" + item_path = /obj/item/clothing/shoes/wheelys/rollerskates diff --git a/modular_doppler/loadout_categories/categories/undersuit.dm b/modular_doppler/loadout_categories/categories/undersuit.dm index debce213a9d44..6a9bc5ac78cc3 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -65,10 +65,6 @@ * FANCYPANTS */ -/datum/loadout_item/undersuit/pants - name = "Pants" - item_path = /obj/item/clothing/under/pants - /datum/loadout_item/undersuit/pants/shorts name = "Shorts" item_path = /obj/item/clothing/under/shorts @@ -153,14 +149,6 @@ name = "Charcoal Pencilskirt" item_path = /obj/item/clothing/under/suit/pencil/charcoal -/datum/loadout_item/undersuit/formal/pencil/navy - name = "Navy Pencilskirt" - item_path = /obj/item/clothing/under/suit/pencil/navy - -/datum/loadout_item/undersuit/formal/pencil/burgandy - name = "Burgandy Pencilskirt" - item_path = /obj/item/clothing/under/suit/pencil/burgandy - /datum/loadout_item/undersuit/formal/pencil/checkered name = "Checkered Pencilskirt with Shirt" item_path = /obj/item/clothing/under/suit/pencil/checkered @@ -189,10 +177,6 @@ * BUTTONDOWNS */ -/datum/loadout_item/undersuit/buttondown - name = "Buttondown" - item_path = /obj/item/clothing/under/costume/buttondown - /datum/loadout_item/undersuit/buttondown/slacks name = "Buttondown w/ Slacks" item_path = /obj/item/clothing/under/costume/buttondown/slacks @@ -210,10 +194,6 @@ * DRESSES */ -/datum/loadout_item/undersuit/dress - name = "Dress" - item_path = /obj/item/clothing/under/dress - /datum/loadout_item/undersuit/dress/giantscarf name = "Giant Scarf" item_path = /obj/item/clothing/under/dress/doppler/giant_scarf @@ -246,10 +226,6 @@ name = "Turtle-Skirt Dress" item_path = /obj/item/clothing/under/dress/skirt/turtleskirt -/datum/loadout_item/undersuit/dress/sailor - name = "Heretical Dress" - item_path = /obj/item/clothing/under/dress/sailor - /datum/loadout_item/undersuit/dress/tutu name = "Pink Tutu" item_path = /obj/item/clothing/under/dress/doppler/pinktutu @@ -288,50 +264,14 @@ name = "Cheongsam (Custom Trim)" item_path = /obj/item/clothing/under/dress/doppler/cheongsam/customtrim -/datum/loadout_item/undersuit/dress/yukata - name = "Basic Yukata" - item_path = /obj/item/clothing/under/dress/doppler/yukata - -/datum/loadout_item/undersuit/dress/yukata/tg - name = "Yukata" - item_path = /obj/item/clothing/under/costume/yukata - /datum/loadout_item/undersuit/dress/yukata/tg/greyscale name = "Custom Yukata" item_path = /obj/item/clothing/under/costume/yukata/greyscale -/datum/loadout_item/undersuit/dress/yukata/tg/green - name = "Aqua Yukata" - item_path = /obj/item/clothing/under/costume/yukata/green - -/datum/loadout_item/undersuit/dress/yukata/tg/green/greyscale - name = "Custom Floral Yukata" - item_path = /obj/item/clothing/under/costume/yukata/green/greyscale - -/datum/loadout_item/undersuit/dress/yukata/tg/white - name = "White Yukata" - item_path = /obj/item/clothing/under/costume/yukata/white - -/datum/loadout_item/undersuit/dress/yukata/tg/white/greyscale - name = "Custom Snowy Yukata" - item_path = /obj/item/clothing/under/costume/yukata/white/greyscale - -/datum/loadout_item/undersuit/dress/kimono - name = "Kimono" - item_path = /obj/item/clothing/under/costume/kimono - /datum/loadout_item/undersuit/dress/kimono/greyscale name = "Custom Kimono" item_path = /obj/item/clothing/under/costume/kimono/greyscale -/datum/loadout_item/undersuit/dress/kimono/red - name = "Red Kimono" - item_path = /obj/item/clothing/under/costume/kimono/red - -/datum/loadout_item/undersuit/dress/kimono/purple - name = "Purple Kimono" - item_path = /obj/item/clothing/under/costume/kimono/purple - /* * MISCELLANEOUS */ @@ -352,6 +292,44 @@ name = "Frontier Jumpsuit" item_path = /obj/item/clothing/under/frontier_colonist +/datum/loadout_item/undersuit/osi + name = "OSI Jumpsuit" + item_path = /obj/item/clothing/under/costume/osi + +/datum/loadout_item/undersuit/lost_mc + name = "Lost MC Clothing" + item_path = /obj/item/clothing/under/costume/tmc + /datum/loadout_item/undersuit/bunnysuit name = "Bunny Suit" item_path = /obj/item/clothing/under/costume/bunnysuit + +/datum/loadout_item/undersuit/combat + name = "Combat Uniform" + item_path = /obj/item/clothing/under/syndicate/combat + +/datum/loadout_item/undersuit/turtleneck + name = "Tactical Turtleneck" + item_path = /obj/item/clothing/under/syndicate + +// Man in suit gif + +/datum/loadout_item/undersuit/bunnysuit + name = "Hard-Worn Suit" + item_path = /obj/item/clothing/under/rank/security/detective + +/datum/loadout_item/undersuit/bunnysuit + name = "Noir Suit" + item_path = /obj/item/clothing/under/rank/security/detective/noir + +/datum/loadout_item/undersuit/disco + name = "Superstar Cop Uniform" + item_path = /obj/item/clothing/under/rank/security/detective/disco + +/datum/loadout_item/undersuit/bunnysuit + name = "Aerostatic Suit" + item_path = /obj/item/clothing/under/rank/security/detective/kim + +/datum/loadout_item/undersuit/disco + name = "Executive Suit" + item_path = /obj/item/clothing/under/suit/black_really diff --git a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm index 58a142223e279..d449b947e4309 100644 --- a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm +++ b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm @@ -5,14 +5,13 @@ var/mask_overlay_icon = null /obj/item/clothing/head/utility/hardhat/welding/doppler_command - name = "generic command hardhat" + name = "heavy-duty hardhat" desc = "A heavy-duty hardhat for protecting the heads of the heads when everything starts to go wrong." icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi' icon_state = null hat_type = null worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi' mask_overlay_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi' - resistance_flags = FIRE_PROOF | ACID_PROOF clothing_flags = STOPSPRESSUREDAMAGE | STACKABLE_HELMET_EXEMPT heat_protection = HEAD @@ -20,46 +19,54 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT light_range = 4 + /// Does this have the reflective stripe on it? + var/has_shiny = FALSE /obj/item/clothing/head/utility/hardhat/welding/doppler_command/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() - if(!isinhands) + if(!isinhands && has_shiny) . += emissive_appearance(icon_file, "hardhat_emissive", src, alpha = src.alpha) /obj/item/clothing/head/utility/hardhat/welding/doppler_command/medical name = "medical command hardhat" icon_state = "hardhat0_med" hat_type = "med" + has_shiny = TRUE /obj/item/clothing/head/utility/hardhat/welding/doppler_command/science name = "science command hardhat" icon_state = "hardhat0_sci" hat_type = "sci" + has_shiny = TRUE /obj/item/clothing/head/utility/hardhat/welding/doppler_command/engineering name = "engineering command hardhat" icon_state = "hardhat0_eng" hat_type = "eng" + has_shiny = TRUE /obj/item/clothing/head/utility/hardhat/welding/doppler_command/cargo name = "supply command hardhat" icon_state = "hardhat0_cargo" hat_type = "cargo" + has_shiny = TRUE /obj/item/clothing/head/utility/hardhat/welding/doppler_command/command name = "command hardhat" icon_state = "hardhat0_cmd" hat_type = "cmd" + has_shiny = TRUE /obj/item/clothing/head/utility/hardhat/welding/doppler_command/security name = "security command hardhat" icon_state = "hardhat0_sec" hat_type = "sec" + has_shiny = TRUE /// Beret but cooler /obj/item/clothing/head/beret/doppler_command - name = "generic command beret" + name = "slim beret" desc = "A slim beret denoting the wearer as the command for some aspect of the station." icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi' @@ -71,6 +78,9 @@ greyscale_colors = null flags_1 = NONE +/obj/item/clothing/head/beret/doppler_command/light + icon_state = "light" + /obj/item/clothing/head/beret/doppler_command/medical name = "medical command beret" icon_state = "doppler_med" diff --git a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm index 449221da02e09..5bc48ec1b12e6 100644 --- a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm +++ b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm @@ -1,5 +1,5 @@ /obj/item/clothing/neck/doppler_mantle - name = "generic command mantle" + name = "hazard mantle" desc = "A command mantle made of fire and acid proof materials to protect the wearer." icon = 'modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi' @@ -8,32 +8,43 @@ w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|ARMS resistance_flags = FIRE_PROOF | ACID_PROOF + /// Does this have the reflective colored strip on it? + var/has_shiny = FALSE /obj/item/clothing/neck/doppler_mantle/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() - if(!isinhands) + if(!isinhands && has_shiny) . += emissive_appearance(icon_file, "mantle-emissive", src, alpha = src.alpha) +/obj/item/clothing/neck/doppler_mantle/light + icon_state = "light" + /obj/item/clothing/neck/doppler_mantle/medical name = "medical command mantle" icon_state = "doppler_med" + has_shiny = TRUE /obj/item/clothing/neck/doppler_mantle/science name = "science command mantle" icon_state = "doppler_sci" + has_shiny = TRUE /obj/item/clothing/neck/doppler_mantle/engineering name = "engineering command mantle" icon_state = "doppler_eng" + has_shiny = TRUE /obj/item/clothing/neck/doppler_mantle/cargo name = "supply command mantle" icon_state = "doppler_cargo" + has_shiny = TRUE /obj/item/clothing/neck/doppler_mantle/command name = "command mantle" icon_state = "doppler_cmd" + has_shiny = TRUE /obj/item/clothing/neck/doppler_mantle/security name = "security command mantle" icon_state = "doppler_sec" + has_shiny = TRUE diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi index c2ac9f2de5f7de93f320ef382e4b2a5ea7932768..57fe4deb827d5c023bd2acf0e459c7045b05b818 100644 GIT binary patch delta 2216 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 JPDHLkV1nDrBd7oX diff --git a/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi b/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi index 0bcbf4e013017bf01cba6ba8519111761d3be8d1..73a422c356192251a2946805818e0186114523a4 100644 GIT binary patch literal 2584 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 OKj!J??TUw;z40HHH4Bpf literal 2454 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 YETJles_=of>aTgl`ZV0U4C;RSUxf*`T>t<8 diff --git a/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi index 9f8eee4144746f675e7cc8425374459196c2fd50..c38efb1f95f1ff272a17374e604b4fb0d7be42d9 100644 GIT binary patch delta 1436 zcmZwF4K&kh90%|@qp8WfB%#_Axn6d?bwe0+y`)=SuBDEbCa+7=yo8&~Uy`@zdMVlo zBZ<7NOU5EAtq9k9gl_XL6Sgs%+3e0er+e=?_de%$&hwn_dCqg5=lT2?&}z9XEvejW z?LcLM!O!O}wvcEA1pcAXs0I{?-% z)=h8cS-qhLdQxd)gMN?lQ0RVDFMC3t>T8HhS|%+0g7MqbR6%hnV4He7T@m@H|Ki~f zDDOLEa~a0J!{r)cov`U110hjdv-XLA7=S_?Eu>C<<$=4FwJmw$8}TtgF}Wg>9iVT+ z^;qRV{OcE2Mj)K|sqUj1qK$&*>qsQbD;el@jbWkA-8+iQ#zP7G#BVGce$m+oS7*dLHJdB3))I(>5$ z4#iU0uJv`RYox0w`Oej(9jhs6t9fgQq};nN@U**;X`D;JKsk zwnwTBis$|{9;o9VD}fd&h&#x%x63*)pQ8zyTQ|M?LqzuF#Vjjlhpe4#3hFY=f=X3c z{AxF>w=_VSh>$CB3#(krkvY(KeJ*7&S1};bD9Pajk2RaNc*O^N>XQ#ajj~WQD6F?q z$yR$y42&Cp!ZI16uGboPjcr231}^pi?`B?^Gbp-1TvNPRSKSgaWh3~y-XT*C!&#@6 z_9gV^&`^SFeM>T)aZPOHe%4-ONJ3MrqpKeXjy-!?g2du3&yH8E2R#VUQ*SXZ$5|Rj z^@WJ$$-5-MSj%)Xo!cO9giG|rF%4S}3Ru0TG&H85ZAWBx(OfuO+?#;MnY-ENxbLM; z0Kg=^^|Kov6;4>XrKLS+w0o!mZoDKT+iMX!7kGX|q{@LY+OiIm7@!lV$ zl^Ro`>U55uCYN-%D-yHe7djh#X2BKWm*R^Tn(yXEC~(krL63I}+6&l$HJ8H?1 delta 1358 zcmZ`%dsNZ~7{$=kr3XZ(_HZ~wEz@D1)RG7_t>vp)n%XKXNnK_vqckCZO7uX}OtM5R ze4)`pPD*O|HqFOWSPb!nc(A4B8)twB%+=cd*}ikn`Of{$_s2c=-lqoQb(sjQ^gA|W zppEGf)-2%aY^nlT#7B*HCiJ2~ARWW~-kw1T`7?RgvnIhNZ}0(HRNrXF9}PYW=pNX{V_6_1y@`A5z66QgE<>40i6lHPq572lgbmq&~&d+^#E^kqDnH&YXn z1-Hx34>K-A6g!}PgDYwtPbbQ*Zdu?TFB_n;KXP;A%#&bYpF_O8nN9y&rb`8Ok(SE8 zS(?s8rEknS`^)=w@L2m#6qY=GVr|movokl4s4k|2&+RZL`@cm4YC>ItF!07byI!F$ zt&DNUNt=puSJQbF31b@rir%k=QlE?M6p zXR<%^I?thIAWnR@HQpn_bbwG~m*GD`#srR|Y=M zWW>-$*q?=490Y!6h?qCK&1bu$v9uQASak(r2sj*{^7&b%ik^`3lLG9KY(kgmy@i<< zNPp+BEgwj8*9p_vTVHly!7-0Fz*B6M=}rgQ^l$7@TsZ$ZHI_xFF04A;rBawDWf#`^8PV^| z=C)UleSj3K3~B10R~_q-dDg6+jhOGwEa}!Ab7OS+9vZ5?UlI`@(=5U7OK2KAMB2nt$K^#5M2|lwP&+4;sDUM-VhkP zWvW;JA5{-de&?eyOUlX!zU)J+()h&veW&`fq4JMZ?d64R&CR{wm;ppFr<&uW<68ga?{! diff --git a/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi b/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi index bec78857245a84b7039f3bf05d724c46cb771d10..1f77c6cb62155a7d90d3453862bdeb44e0ec6401 100644 GIT binary patch delta 943 zcmV;g15o^-2;m5jBmt9=C4zq?s2~Rve7IC8E4cc(fMWmvhURjeaFp`k000AtNklF|90%~7v^BxPUE1uAAtpsFWtZrX1}RZq3Id@z6ov@W!JtFo!PxMSX>rQqlOLUwke|@hzPXiHVKWM^*(D`%YZW(01}+ zZBGB!Z=bY&whl3{qo;q`a`t_A{XQi2Ee(C9?bz_%oc_Dl`^yr)dtrvQpKWjV6o1V- zKuo?|Z-{N9B_C&>dYm6(@N)g^nRZ(8arUXlt>^ef6Cfv1TIN>c|X*5$s&Et_dk`<%y{jDMuFffldvt94F9e#aHM`c;36OTTq~q$}cf7Ybc{ zsuwS30u^8T86aBqPLLDbdo4=stH;%}PbMpsS}f^zuxQmQQ4X|bY=PR-Z@X!qoUAuf zkIE8%ByK;0W?Qa!itp+q)rYa1=yL;`sD1w6FSVtdcqjE?C1 z{LxnXTjs``WjudA0000000000000000000000aZ-1DNBZK0uSH@%ye1=#SfV0Tc6? zoc?mv2lPdUX?rp?l+$0z`ha5N@3MB#_Eh#)PQUK>Q6I1d)8qGDA8_zc9W82~+mk3n z=l%SxhudgT`<%ynr8EAM)nQuHKIieppgur@$?^NH4;X(xAES17+G42>80?s)_G8^G zWAy>W#(!^P6SZUY8BgQ)T^}%bY$vsMW`DX0>_xu!^CvIZ3Fv#;Nv+BE^Ye}WVkA!O zlk_~bCdUr|000000002NR`Gv0N+y%6@wNX?7|cKdm>~hokN{>#05c?j84|z@31Ef< zFhc^EApw8P0#_d(UOyilA4$ZTTN9$~9k@#CVJnjO@nz0+{GOg3181o(aP7q2%!j&Bms?)C4zs&r9fH1)z1YSwg4S>XXnXy&OHDC15ZgrK~#90?b}ai z(@-1-@W$26!IZUF>z~QcqG<8YMLf6(Ziw!pAPm%lQW=At6g((9Oe#J2XW~IT40cmc z4}zc`hKE^n?%+{y2%_F}bI^K`c&of$c=D3<&r8zuXWH)v!b|d+{qld_FKOn?FA@O& z00000004ki(dPDm)b?Ga-8<9S_Kwc1Xt(zC(z;=^Wli(<^&n2Nnd7f=6F44EmWscM zEBfR<(Jwyd_9S#%y*pJJ7&=!qzUUX93sZbU=R;y*W8JY8LB+l!=S|wqKj^gefBE`J z>u2i_13P%E&$jRVt9O49v2S_eGi@hwJ8b>8E{`=N{_x@)Z9m=E?aiyt) z6YFwc&$_j=sC~}kgN%P*FiDHo_)(n`k>7EZu71_h@=u)~>56~2-Gxe5pX&LGxlqN| zeg=qEy%Xd_k6emV`|?qg_Q_-w3QKkU4i>F?CCY(zOfFJ;{LL`!lauv&=3ztP-%MN2 zp!w7VPw`!yr1~(H6MgF98fu^2`$KI#C*DbY7|MZeduv?~-wsIzer2)?i?%4;UYqrS@ajwZQ5Fs*V57 z>RxImyG>8y_gx<_erPkbH|D>)3hYI>_w%RESP2+?GDvNZ@8_2r|JhiY+Q-EOYJ(g< z0000000000gd6)Gj`I0D_bIT_{y$*|1`@!NE(97)#$F$g$zXRu1BNYpw(+&&TLqx9t0000 Date: Wed, 18 Dec 2024 03:15:15 -0600 Subject: [PATCH 02/14] s --- .../loadout_categories/categories/undersuit.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modular_doppler/loadout_categories/categories/undersuit.dm b/modular_doppler/loadout_categories/categories/undersuit.dm index 6a9bc5ac78cc3..36d5c402607c9 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -65,6 +65,9 @@ * FANCYPANTS */ +/datum/loadout_item/undersuit/pants + abstract_type = /datum/loadout_item/undersuit/pants + /datum/loadout_item/undersuit/pants/shorts name = "Shorts" item_path = /obj/item/clothing/under/shorts @@ -264,11 +267,11 @@ name = "Cheongsam (Custom Trim)" item_path = /obj/item/clothing/under/dress/doppler/cheongsam/customtrim -/datum/loadout_item/undersuit/dress/yukata/tg/greyscale +/datum/loadout_item/undersuit/dress/yukata name = "Custom Yukata" item_path = /obj/item/clothing/under/costume/yukata/greyscale -/datum/loadout_item/undersuit/dress/kimono/greyscale +/datum/loadout_item/undersuit/dress/kimono name = "Custom Kimono" item_path = /obj/item/clothing/under/costume/kimono/greyscale @@ -288,7 +291,7 @@ name = "Colorable Jumpskirt" item_path = /obj/item/clothing/under/color/jumpskirt -/datum/loadout_item/undersuit/jumpsuit/frontier +/datum/loadout_item/undersuit/frontier name = "Frontier Jumpsuit" item_path = /obj/item/clothing/under/frontier_colonist @@ -314,11 +317,11 @@ // Man in suit gif -/datum/loadout_item/undersuit/bunnysuit +/datum/loadout_item/undersuit/detective_suit name = "Hard-Worn Suit" item_path = /obj/item/clothing/under/rank/security/detective -/datum/loadout_item/undersuit/bunnysuit +/datum/loadout_item/undersuit/noir_suit name = "Noir Suit" item_path = /obj/item/clothing/under/rank/security/detective/noir @@ -326,7 +329,7 @@ name = "Superstar Cop Uniform" item_path = /obj/item/clothing/under/rank/security/detective/disco -/datum/loadout_item/undersuit/bunnysuit +/datum/loadout_item/undersuit/aerostatic name = "Aerostatic Suit" item_path = /obj/item/clothing/under/rank/security/detective/kim From 2c33f440340456ccc08c66184a170e7fee628089 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 03:55:15 -0600 Subject: [PATCH 03/14] d --- modular_doppler/loadout_categories/categories/undersuit.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modular_doppler/loadout_categories/categories/undersuit.dm b/modular_doppler/loadout_categories/categories/undersuit.dm index 36d5c402607c9..f2904165eaa95 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -180,6 +180,9 @@ * BUTTONDOWNS */ +/datum/loadout_item/undersuit/buttondown + abstract_type = /datum/loadout_item/undersuit/buttondown + /datum/loadout_item/undersuit/buttondown/slacks name = "Buttondown w/ Slacks" item_path = /obj/item/clothing/under/costume/buttondown/slacks @@ -197,6 +200,9 @@ * DRESSES */ +/datum/loadout_item/undersuit/dress + abstract_type = /datum/loadout_item/undersuit/dress + /datum/loadout_item/undersuit/dress/giantscarf name = "Giant Scarf" item_path = /obj/item/clothing/under/dress/doppler/giant_scarf From 27083ba2b127d803d4054582536d7b2f3a039104 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 04:41:45 -0600 Subject: [PATCH 04/14] fixes some weird stuff --- code/modules/clothing/suits/bio.dm | 4 +- .../loadout_categories/categories/belts.dm | 2 +- .../loadout_categories/categories/clothing.dm | 65 +++++++++++++++++++ .../loadout_categories/categories/pockets.dm | 6 +- .../modular_cosmetics/code/shoes/baseshoes.dm | 2 + .../modular_cosmetics/code/suits/basesuits.dm | 2 +- 6 files changed, 74 insertions(+), 7 deletions(-) diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 919d1da261ecb..3b6c6a7681272 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -14,8 +14,8 @@ /obj/item/clothing/head/bio_hood/Initialize(mapload) . = ..() - if(flags_inv & HIDEFACE) - AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES) + /* if(flags_inv & HIDEFACE) // DOPPLER EDIT REMOVAL + AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES) */ AddComponent(/datum/component/adjust_fishing_difficulty, 6) AddComponent(/datum/component/hat_stabilizer, loose_hat = TRUE) diff --git a/modular_doppler/loadout_categories/categories/belts.dm b/modular_doppler/loadout_categories/categories/belts.dm index 8512e23d83cc6..b7457015a32d6 100644 --- a/modular_doppler/loadout_categories/categories/belts.dm +++ b/modular_doppler/loadout_categories/categories/belts.dm @@ -69,7 +69,7 @@ name = "Explorer's Webbing" item_path = /obj/item/storage/belt/mining -/datum/loadout_item/belts/mining +/datum/loadout_item/belts/mining_alt name = "Explorer's Webbing (Alt)" item_path = /obj/item/storage/belt/mining/alt diff --git a/modular_doppler/loadout_categories/categories/clothing.dm b/modular_doppler/loadout_categories/categories/clothing.dm index d7054e71faf4f..709214df1492b 100644 --- a/modular_doppler/loadout_categories/categories/clothing.dm +++ b/modular_doppler/loadout_categories/categories/clothing.dm @@ -297,3 +297,68 @@ /datum/loadout_item/suit/mantella name = "Mothic Mantella" item_path = /obj/item/clothing/suit/mothcoat/winter + +// WINTER COATS + +/datum/loadout_item/suit/coat_med + name = "Medical Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/medical + +/datum/loadout_item/suit/coat_paramedic + name = "Paramedic Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic + +/datum/loadout_item/suit/coat_robotics + name = "Robotics Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/science/robotics + +/datum/loadout_item/suit/coat_sci + name = "Science Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/science + +/datum/loadout_item/suit/coat_eng + name = "Engineering Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/engineering + +/datum/loadout_item/suit/coat_atmos + name = "Atmospherics Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos + +/datum/loadout_item/suit/coat_hydro + name = "Hydroponics Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/hydro + +/datum/loadout_item/suit/coat_cargo + name = "Cargo Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/cargo + +/datum/loadout_item/suit/coat_miner + name = "Mining Winter Coat" + item_path = /obj/item/clothing/suit/hooded/wintercoat/miner + +// JACKETS + +/datum/loadout_item/suit/qm_jacket + name = "Quartermaster's Overcoat" + item_path = /obj/item/clothing/suit/jacket/quartermaster + restricted_roles = list(JOB_QUARTERMASTER) + +/datum/loadout_item/suit/departmental_jacket + name = "Work Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket + +/datum/loadout_item/suit/engi_dep_jacket + name = "Engineering Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/engi + +/datum/loadout_item/suit/med_dep_jacket + name = "Medical Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/med + +/datum/loadout_item/suit/cargo_dep_jacket + name = "Cargo Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/supply + +/datum/loadout_item/suit/sec_dep_jacket_red + name = "Security Department Jacket" + item_path = /obj/item/clothing/suit/jacket/doppler/departmental_jacket/sec/red diff --git a/modular_doppler/loadout_categories/categories/pockets.dm b/modular_doppler/loadout_categories/categories/pockets.dm index 33220d168ab87..d447b9abd2485 100644 --- a/modular_doppler/loadout_categories/categories/pockets.dm +++ b/modular_doppler/loadout_categories/categories/pockets.dm @@ -84,15 +84,15 @@ name = "Survival Knife" item_path = /obj/item/knife/combat/survival -/datum/loadout_item/pocket_items/london_two +/datum/loadout_item/pocket_items/injector_case name = "Autoinjector Case" item_path = /obj/item/storage/epic_loot_medpen_case -/datum/loadout_item/pocket_items/london_two +/datum/loadout_item/pocket_items/docs_case name = "Documents Case" item_path = /obj/item/storage/epic_loot_docs_case -/datum/loadout_item/pocket_items/london_two +/datum/loadout_item/pocket_items/org_case name = "Organizational Pouch" item_path = /obj/item/storage/epic_loot_org_pouch diff --git a/modular_doppler/modular_cosmetics/code/shoes/baseshoes.dm b/modular_doppler/modular_cosmetics/code/shoes/baseshoes.dm index 889b94e0f1f1d..adf43acb06a22 100644 --- a/modular_doppler/modular_cosmetics/code/shoes/baseshoes.dm +++ b/modular_doppler/modular_cosmetics/code/shoes/baseshoes.dm @@ -20,6 +20,8 @@ greyscale_config_worn_bodyshapes = list(BODYSHAPE_HUMANOID_T = /datum/greyscale_config/sneakers_marisa/worn, BODYSHAPE_DIGITIGRADE_T = /datum/greyscale_config/sneakers_marisa/worn/digi) +/obj/item/clothing/shoes/glow + supported_bodyshapes = null /datum/greyscale_config/sneakers/worn diff --git a/modular_doppler/modular_cosmetics/code/suits/basesuits.dm b/modular_doppler/modular_cosmetics/code/suits/basesuits.dm index 19688ac500047..e26c334745c5e 100644 --- a/modular_doppler/modular_cosmetics/code/suits/basesuits.dm +++ b/modular_doppler/modular_cosmetics/code/suits/basesuits.dm @@ -1,7 +1,7 @@ /obj/item/clothing/suit/bio_suit supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) - bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/head/bio.dmi', + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/suits/bio.dmi', BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/bio_digi.dmi') /obj/item/clothing/suit/wizrobe From 3390db3d3c9ca5c2362a67c9ead539c0b9c8f9d0 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 07:07:57 -0600 Subject: [PATCH 05/14] techno visor --- code/modules/loadout/categories/heads.dm | 4 +- .../loadout_categories/categories/glasses.dm | 4 ++ .../super_glasses/code/glasses_stats_thief.dm | 47 ++++++++++++++++++ .../super_glasses/code/techno_visors.dm | 38 ++++++++++++++ .../super_glasses/icons/visors.dmi | Bin 0 -> 1110 bytes .../super_glasses/icons/worn/visors.dmi | Bin 0 -> 1082 bytes tgstation.dme | 2 + 7 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 modular_doppler/super_glasses/code/glasses_stats_thief.dm create mode 100644 modular_doppler/super_glasses/code/techno_visors.dm create mode 100644 modular_doppler/super_glasses/icons/visors.dmi create mode 100644 modular_doppler/super_glasses/icons/worn/visors.dmi diff --git a/code/modules/loadout/categories/heads.dm b/code/modules/loadout/categories/heads.dm index 8fd2c268c1105..86858b3aff1a4 100644 --- a/code/modules/loadout/categories/heads.dm +++ b/code/modules/loadout/categories/heads.dm @@ -126,7 +126,7 @@ /* /datum/loadout_item/head/plague_doctor // DOPPLER EDIT REMOVAL name = "Cap (Plague Doctor)" - item_path = /obj/item/clothing/head/bio_hood/plague + item_path = /obj/item/clothing/head/bio_hood/plague */ /datum/loadout_item/head/rose name = "Rose" @@ -150,7 +150,7 @@ /datum/loadout_item/head/harebell name = "Harebell" - item_path = /obj/item/food/grown/harebell */ + item_path = /obj/item/food/grown/harebell /datum/loadout_item/head/wig name = "Wig" diff --git a/modular_doppler/loadout_categories/categories/glasses.dm b/modular_doppler/loadout_categories/categories/glasses.dm index d63e1d99821c2..50d99accf50c0 100644 --- a/modular_doppler/loadout_categories/categories/glasses.dm +++ b/modular_doppler/loadout_categories/categories/glasses.dm @@ -17,3 +17,7 @@ /datum/loadout_item/glasses/fake_blindfold name = "Fake Blindfold" item_path = /obj/item/clothing/glasses/trickblindfold + +/datum/loadout_item/glasses/techno_visor + name = "Techno-Visor" + item_path = /obj/item/clothing/glasses/techno_visor diff --git a/modular_doppler/super_glasses/code/glasses_stats_thief.dm b/modular_doppler/super_glasses/code/glasses_stats_thief.dm new file mode 100644 index 0000000000000..9a36a9c6cd08c --- /dev/null +++ b/modular_doppler/super_glasses/code/glasses_stats_thief.dm @@ -0,0 +1,47 @@ +/datum/component/glasses_stats_thief + +/datum/component/glasses_stats_thief/Initialize(successful_robberies = 1) + if(!isclothing(parent)) + return COMPONENT_INCOMPATIBLE + + RegisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(try_consume)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) + + src.successful_robberies = successful_robberies + +/datum/component/glasses_stats_thief/proc/examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + + examine_list += span_notice("You can use this on another pair of glasses to copy the hud, flash protection, night vision, etc. from them.") + +/// Checks if the atom interacted with has the requirements to be consumed or not +/datum/component/glasses_stats_thief/proc/try_consume(datum/source, mob/living/user, obj/item/thing) + SIGNAL_HANDLER + + var/obj/item/clothing/glasses/attacking_glasses = thing + if(!istype(attacking_glasses)) + return + // Do the glasses attacking us have any of the things we care about? + if(!attacking_glasses.color_cutoffs && (!attacking_glasses.flash_protect != FLASH_PROTECTION_NONE) && (!length(attacking_glasses.clothing_traits)) && !attacking_glasses.vision_flags) + return + INVOKE_ASYNC(src, PROC_REF(consume), user, thing) + +/// Attempts to consume the glasses we are passed and add their stats to the parent +/datum/component/glasses_stats_thief/proc/consume(mob/living/carbon/human/user, obj/item/clothing/glasses/slick_shades) + if(!slick_shades) + return + if(!do_after(user, 5 SECONDS, slick_shades)) + return + + var/obj/item/clothing/glasses/thief = parent + + thief.color_cutoffs = slick_shades.color_cutoffs + thief.forced_glass_color = slick_shades.forced_glass_color + thief.change_glass_color(slick_shades.glass_colour_type) + thief.clothing_traits = slick_shades.clothing_traits + thief.flash_protect = slick_shades.flash_protect + thief.vision_flags = slick_shades.vision_flags + thief.tint = slick_shades.tint + playsound(slick_shades, 'sound/effects/industrial_scan/industrial_scan1.ogg', 50, TRUE) + do_sparks(3, FALSE, slick_shades) + qdel(slick_shades) diff --git a/modular_doppler/super_glasses/code/techno_visors.dm b/modular_doppler/super_glasses/code/techno_visors.dm new file mode 100644 index 0000000000000..c75217d510f6d --- /dev/null +++ b/modular_doppler/super_glasses/code/techno_visors.dm @@ -0,0 +1,38 @@ +/obj/item/clothing/glasses/techno_visor + name = "techno-visor" + desc = "A complicated, curved visor with a network of cameras that allow vision through it. \ + Has the unique ability to consume the traits of specialized huds and glasses it touches, \ + becoming like the much lamer piece of eyewear it just destroyed. Surely it's fine to have this \ + so close to your eyes." + icon = 'modular_doppler/super_glasses/icons/visors.dmi' + icon_state = "black" + worn_icon = 'modular_doppler/super_glasses/icons/worn/visors.dmi' + worn_icon_state = "black" + obj_flags = UNIQUE_RENAME | INFINITE_RESKIN + uses_advanced_reskins = TRUE + unique_reskin = list( + "Tactical Black" = list( + RESKIN_ICON_STATE = "black", + RESKIN_WORN_ICON_STATE = "black", + ), + "Shiny Steel" = list( + RESKIN_ICON_STATE = "shiny", + RESKIN_WORN_ICON_STATE = "shiny", + ), + "Polished Copper" = list( + RESKIN_ICON_STATE = "copper", + RESKIN_WORN_ICON_STATE = "copper", + ), + "Display Green" = list( + RESKIN_ICON_STATE = "green", + RESKIN_WORN_ICON_STATE = "green", + ), + "Vintage Computer" = list( + RESKIN_ICON_STATE = "vintage", + RESKIN_WORN_ICON_STATE = "vintage", + ), + ) + +/obj/item/clothing/glasses/techno_visor/Initialize(mapload) + . = ..() + AddComponent(/datum/component/glasses_stats_thief) diff --git a/modular_doppler/super_glasses/icons/visors.dmi b/modular_doppler/super_glasses/icons/visors.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7c1d4459a7f9ad0acf57bf6e8ac30406a5f528fa GIT binary patch literal 1110 zcmeAS@N?(olHy`uVBq!ia0vp^2|(TJYJ_wA_3w6ZGw zx8-w1k87{Fl=--~RuvZ0sL&-Tlpx{R!Xmb&qY0Op#*X5q`Aw(y@*Ar~gQ~!E(VbcK+XeN7Q$5 zHn{y^PCg!3^B{$xal?UW@85ja+{f3#x~(RCzyHVf7o5_`r@t?`A6hfvG=m#=tJzAg zibEL-FQ`rB^q-U=DUmqAz2Z@ccnXtpMGJ%52M(s52Z57(n9IuQm&6ssXasxjD~T7G zx7bJ5^5=`xhn6u}bCom%gA$J`r^S@*;%iG5@H!uTS^4Z%vndi|TLRPjgIL<22rXZ>)Q`)~iDJ-h1Z1hoWbGU~B&U zH{-{lXti~)7!qK4m{9QGzSa75>)2xVU--`0WPhaLKnG)^ATyIP8;ctcM~{SngrR~# zl0$+Kuf@GxYiG&d*VwXdve?RvhUVKBSj|1ol{?jRVSyEMp08Z@vh}`}{#_ead^~zo z+kDZ@n}yFmN_5Y%nvm%r_ptWbBvAC-)i;{o6J5Rc-tU=jUc{|=kiT9p#`mwl`k7yn z-+b#p{{n@r9Sb&nS#;%! zP1CAVMxVWeE(aH`1X}mCnDMs+gIb%LQ?AmUAeY9;oCTUI;U=c0Ztgy)0<#?CXHOCXpjsjo0_mp_G@M!U?NnF$YbfJt# z=h8ps&%L>x5?kKAsVgtrCm)d(Q*i&yo9X7K5AAVk@b&Xs^timdeDUMwciDb1Ovz`{ zn8L`lb>p4-jJ&+auG`Db`tF|}{b%Eh9C5K{+?lcwVQWh5y5>J$RU}uIlOL<~Hu$;C z+w=S1NNy;7zOG=&e)}ysH>Iq;zx9>-xbrIe6!nj_$G^v0$rncJu0Fot+|QfZ=7(;a zIbHDQ(9sVCk1{`XoPV45KKAq#Qm*>_$hYF}pTN*#zox(U_iMjkCUNM^-l@4;_SpZyBl|C$Z@t zbTV~mC{#Ojct-Du`;5hX|NclPv4xb8<5ZXrL!Mm|$~5^>yYox!&2vy+ha5eTu2HJ6Y3dwX`3&ew#?2Rbj5X4P+sx6(iAtp5M^|Gg~SQ@wy*SY?{zvsU-q zzt>ZDzt{PC>^`IF1V%2Hn}ErIMCQ|f`yTAMKi#{SP2?0qtC7RPQ&IEIe*O8%|JwC* zoou!@JBn>>D(cN|9xMIy=vKj2Gm{d_8l5_h@b$cHFUx~ZD%)MZT)gJl@gV+3zx&?r zFR^>HEh?;k;x)_fLONG=F|SGSwOE>6vuDOl!{YCAU*`YgJMl?KhjdpW#nWFFznotM UXY5xz1{MYkp00i_>zopr0Hl`O&;S4c literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 9fb5ba4b91a1d..48ca73dfea85f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7206,6 +7206,8 @@ #include "modular_doppler\sprite_swaps\code\bigclosets.dm" #include "modular_doppler\stone\code\ore_veins.dm" #include "modular_doppler\stone\code\stone.dm" +#include "modular_doppler\super_glasses\code\glasses_stats_thief.dm" +#include "modular_doppler\super_glasses\code\techno_visors.dm" #include "modular_doppler\tableflip\tableflip.dm" #include "modular_doppler\the-business\code\twitch.dm" #include "modular_doppler\time_clock\code\console.dm" From 6bcbb4976f0f23cc05db372629271b2d63e7df13 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 07:13:34 -0600 Subject: [PATCH 06/14] adds red reskin --- .../super_glasses/code/techno_visors.dm | 4 ++++ .../super_glasses/icons/visors.dmi | Bin 1110 -> 1174 bytes .../super_glasses/icons/worn/visors.dmi | Bin 1082 -> 1255 bytes 3 files changed, 4 insertions(+) diff --git a/modular_doppler/super_glasses/code/techno_visors.dm b/modular_doppler/super_glasses/code/techno_visors.dm index c75217d510f6d..c397c74400722 100644 --- a/modular_doppler/super_glasses/code/techno_visors.dm +++ b/modular_doppler/super_glasses/code/techno_visors.dm @@ -31,6 +31,10 @@ RESKIN_ICON_STATE = "vintage", RESKIN_WORN_ICON_STATE = "vintage", ), + "Violent Red" = list( + RESKIN_ICON_STATE = "violent", + RESKIN_WORN_ICON_STATE = "violent", + ), ) /obj/item/clothing/glasses/techno_visor/Initialize(mapload) diff --git a/modular_doppler/super_glasses/icons/visors.dmi b/modular_doppler/super_glasses/icons/visors.dmi index 7c1d4459a7f9ad0acf57bf6e8ac30406a5f528fa..0a37e2cba5aaa824dfd3393f652da939897c611e 100644 GIT binary patch delta 1028 zcmcb{F^zMA3ge`Sstxr@SDrp!@@(pZpyg{Gyn4>WC&^%45_rine04Yj1M_}Q7srr_ zId5+t^cHoLVgImoN%MChtCE0){~E%ZJQH1{f-X9)Xm7me%4H>T^?pEL`+^GbkB)(j z?JFjjC~5i_{AK34;@o~FYY*hZ38Qr9OSOBdGYgXrEzLS%Ke;>(?ij zyuWvN@4k86vjY6)OZo84wKy}cf9DF$Wks4RWnMq?KYquJ*Zm#S4;J}N)1XBBl5NKM zhn}66|25-XMy%1Tx4;(qS=i+yx0E1r8kEH223)Yae(N<6;!Y(ZIF#|KZTC5QUlXFq)NN8q6_ z%g#wXtG!hJI;{JUW%2x5mgBm6`SskA`%Yf{ovU~_|M82zX7hJ1yP)rN{&zy%hhtp# z+`tSs?t7Q2?)l%cuQS3~`LjE|dp_07-qhT^6RW&Zxww!F8q+g83f@bJXl z40Z?G*Qi1X@s($5jq^U<40>F>Yq4}Lt9`Xqjo#amM<O)Yx|i6RJMxe&E^!ebDVG`Zbz<~%MTXE zpz4R)B;OsX{QI9FZ#SppzRufuPHp**wn>9yD#}#O`K+~4*ax$!d+eY4Iz;!Jt>H0! j-(mFD3znm9$o*rymGh0a^z98J1|aZs^>bP0l+XkKR*CqQ delta 964 zcmbQnd5vR&3S;*~)rR_*S5rh|{>B`zV`EV0aWg)h-_6Ouz})8P;uumf=k2VGSt5=y z$IKsTXB;@BS4U=J&h5w-#*U ziJt#`k=quD_Ze5;{{OFR>>qU9{mqg63E%T|k8O=ikz(Kxezf({v5ohq|46yPa=|Zl z{@;B^)OT?k zG=m#=tJzAgibEL-FQ`rB^q-U=DUmqAz2Z@ccnXtpMGJ%52M(s52Z57(n9IuQm&6ss zXasxjD~T7Gx7bJ5^5=`xhn6u}bCom%gA$J`r^S@*;%iG5@H!uTS^4Z%vndeT(XE-%oQ)TjMm|e{ZaNxYnye_}+Ww zzlWk{eqd|<{Ws&sp=h;rut*YMd6-b};J(%Rb?ew-_h0zV*kpgC;XnstqaZVrG8>B< z4@ZxLfP|rfL6Sp)5wFF)U2A8_-`Ci(ZnD_QjfUpi7g)_b&XqgWbYX!NbDpnU_p$&fl+<>`r{GumZ(LJt#s-6?8T{wFV2PGAwR&njNBQlei@y zW3m;eKi6LV20mHV{Id~lF&OY-)U_OL# z#j$3Bc2myH{71nxveDmWUvaGoc+qOM^>)DDo)ysG?a@%Gd7=L_d$UFGDy1!qpE5HN ca0cW*rc-B^hWDKPZ@>Tqp00i_>zopr0P#7=&Hw-a diff --git a/modular_doppler/super_glasses/icons/worn/visors.dmi b/modular_doppler/super_glasses/icons/worn/visors.dmi index 5fb9af6187c5d255fea8c8f5488273d3b8895322..72f5532af47501fdf3fc0281f0dff7bcaf43c3d4 100644 GIT binary patch literal 1255 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fld3`@N?cNllZ!G7N;32F7#J$% z1cwzAm45#cT=4Ph6D@CDt#fD22X6>9xM=*~kFk;>_FJ}=)^y*#X1R91-S00ygE!5cA(6lGYG3Nnkmrkkd@I#@ zp7^loT>jGUS1i|m{T~03=f=(q&l}fnOIzJ~-nMRQ_N4GXYiim*smPVv{JZqC&rN&n;cV);q4uJ`TiZikLsnPm)(z0ixF za@L){Ua@JPU9zk3gIC_m4{a5nJ~=l=U4I>Kc>dqN#}BQ3bh_YCO1wm+-JCs-(xuJc zt@*vrq^aW0#~J!ez1vrrC#9Zfk4nnkj2szJKPwXSEK~fD)8A zn5$mz#`B`cFF(s+p{^ArZ%|ab&px%b)-LL(@q?+~o<8)w{iq=C+Mf?OZq=W<=D*F2 zoptP==^kV!Zk|&NNy;`qeyNHlFJt`w*WrHqC%Xhj+53{@B?*|fe(^~&YkoGpY7z}B PxfncM{an^LB{Ts5$BsAF delta 759 zcmVQaP@Nm`xpQwhDJhdBFW(Z z00U}CL_t(|obBAtOB7K6!11@yu|oh3uzr#R;+bC zil67IavpYUZ(S6-Ywzt$ z_6Lr3g=b?^;pU}tRT(R;iB}pUdi&x{c>VlQRmS?4?@vyL&^8#t?7fw3w7ft2YCi0_ z^|+?Tk_IoqLN!EyaVE;cn2pHa0dtQ2{2O8hRCXDlP?O;SA(QL@7JmjPROZ$aX*BeG zx%7S6&VWK0pil-VRK?4)xjtXE*XOHLrJsMr0ZyDb7}^fBto-q7-MT{GT%|9&rcWb> z|E!I-j93$|Z}fIJ-?1%>%zR0_OHDXMyEe+28>y^9jEcM3U0VR-=&H*%&>;VXW<^I0lyx*5ga|RU30EIF@ zp~_mG&Gq@}PuACGENcerxN|)`cz-w9#&z=I+HkctG;}$9EPe=AuMLLjcT>qDKG)N8 ztmem3590fd@4s|D;2LlH$np{_lmQB5 pfI=CdPzETI*a0e&>;VWC{RB>I`f$uYsN( Date: Wed, 18 Dec 2024 07:21:34 -0600 Subject: [PATCH 07/14] fake var --- modular_doppler/super_glasses/code/glasses_stats_thief.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modular_doppler/super_glasses/code/glasses_stats_thief.dm b/modular_doppler/super_glasses/code/glasses_stats_thief.dm index 9a36a9c6cd08c..575b176ec4421 100644 --- a/modular_doppler/super_glasses/code/glasses_stats_thief.dm +++ b/modular_doppler/super_glasses/code/glasses_stats_thief.dm @@ -1,14 +1,12 @@ /datum/component/glasses_stats_thief -/datum/component/glasses_stats_thief/Initialize(successful_robberies = 1) +/datum/component/glasses_stats_thief/Initialize() if(!isclothing(parent)) return COMPONENT_INCOMPATIBLE RegisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(try_consume)) RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) - src.successful_robberies = successful_robberies - /datum/component/glasses_stats_thief/proc/examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER From ba588dab43430bb1cddd4813a065c1b8b04fe7e5 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 13:56:16 -0600 Subject: [PATCH 08/14] s --- modular_doppler/modular_cosmetics/code/suits/basesuits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_cosmetics/code/suits/basesuits.dm b/modular_doppler/modular_cosmetics/code/suits/basesuits.dm index e26c334745c5e..19688ac500047 100644 --- a/modular_doppler/modular_cosmetics/code/suits/basesuits.dm +++ b/modular_doppler/modular_cosmetics/code/suits/basesuits.dm @@ -1,7 +1,7 @@ /obj/item/clothing/suit/bio_suit supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) - bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/suits/bio.dmi', + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/head/bio.dmi', BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/suit/bio_digi.dmi') /obj/item/clothing/suit/wizrobe From 5f1b11bfcd8d2a97539a50ad4d6f686e3df07712 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Wed, 18 Dec 2024 13:58:19 -0600 Subject: [PATCH 09/14] v --- code/modules/loadout/categories/pocket.dm | 4 +-- .../loadout_categories/categories/pockets.dm | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/code/modules/loadout/categories/pocket.dm b/code/modules/loadout/categories/pocket.dm index cc653b33de250..ac42c29407299 100644 --- a/code/modules/loadout/categories/pocket.dm +++ b/code/modules/loadout/categories/pocket.dm @@ -43,7 +43,7 @@ return ..() -/* /datum/loadout_item/pocket_items/lipstick_black // DOPPLER EDIT REMOVAL +/datum/loadout_item/pocket_items/lipstick_black name = "Lipstick (Black)" item_path = /obj/item/lipstick/black additional_displayed_text = list("Black") @@ -78,7 +78,7 @@ /datum/loadout_item/pocket_items/lipstick_white name = "Lipstick (White)" item_path = /obj/item/lipstick/white - additional_displayed_text = list("White") */ + additional_displayed_text = list("White") /datum/loadout_item/pocket_items/plush abstract_type = /datum/loadout_item/pocket_items/plush diff --git a/modular_doppler/loadout_categories/categories/pockets.dm b/modular_doppler/loadout_categories/categories/pockets.dm index d447b9abd2485..5fc9805326749 100644 --- a/modular_doppler/loadout_categories/categories/pockets.dm +++ b/modular_doppler/loadout_categories/categories/pockets.dm @@ -48,6 +48,38 @@ if(!equipper.equip_to_slot_if_possible(wallet, slot = ITEM_SLOT_BACKPACK, initial = TRUE)) wallet.forceMove(equipper.drop_location()) +/* +* LIPSTICK +*/ + +/datum/loadout_item/pocket_items/lipstick_green + name = "Green Lipstick" + item_path = /obj/item/lipstick/green + +/datum/loadout_item/pocket_items/lipstick_white + name = "White Lipstick" + item_path = /obj/item/lipstick/white + +/datum/loadout_item/pocket_items/lipstick_blue + name = "Blue Lipstick" + item_path = /obj/item/lipstick/blue + +/datum/loadout_item/pocket_items/lipstick_black + name = "Black Lipstick" + item_path = /obj/item/lipstick/black + +/datum/loadout_item/pocket_items/lipstick_jade + name = "Jade Lipstick" + item_path = /obj/item/lipstick/jade + +/datum/loadout_item/pocket_items/lipstick_purple + name = "Purple Lipstick" + item_path = /obj/item/lipstick/purple + +/datum/loadout_item/pocket_items/lipstick_red + name = "Red Lipstick" + item_path = /obj/item/lipstick + /* * GUM */ From d95a5363deff0632e4940fe2f51dd20e746ffb25 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Thu, 19 Dec 2024 02:47:27 -0600 Subject: [PATCH 10/14] crazy pulls --- .../epic_loot/code/loot_items/electronics.dm | 26 +++++++++++++++++++ .../loadout_categories/categories/pockets.dm | 8 ++++++ 2 files changed, 34 insertions(+) diff --git a/modular_doppler/epic_loot/code/loot_items/electronics.dm b/modular_doppler/epic_loot/code/loot_items/electronics.dm index 5719a1ed842e6..3c72b52530412 100644 --- a/modular_doppler/epic_loot/code/loot_items/electronics.dm +++ b/modular_doppler/epic_loot/code/loot_items/electronics.dm @@ -141,3 +141,29 @@ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 2, ) + +/obj/item/computer_disk/all_of_them + desc = "Removable disk used to store data. This one has a strange slogan printed on the label: \ + 'We steam, Steamapps, COMMON'. Whatever that might mean." + max_capacity = 128 + starting_programs = list( + /datum/computer_file/program/arcade/eazy, // 6 GQ + /datum/computer_file/program/radar/lifeline, // 5 GQ + /datum/computer_file/program/radar/custodial_locator, // 2 GQ + /datum/computer_file/program/supermatter_monitor, // 5 GQ + /datum/computer_file/program/newscaster, // 2 GQ + /datum/computer_file/program/secureye/syndicate, // 5 GQ + /datum/computer_file/program/status, // 1 GQ + /datum/computer_file/program/maintenance/phys_scanner, // 2 GQ + /datum/computer_file/program/maintenance/camera, // 4 GQ + /datum/computer_file/program/maintenance/modsuit_control, // 2 GQ + /datum/computer_file/program/maintenance/spectre_meter, // 7 GQ + /datum/computer_file/program/maintenance/cool_sword, // 1 GQ + /datum/computer_file/program/maintenance/theme/cat, // 2 GQ + /datum/computer_file/program/maintenance/theme/lightmode, // 2 GQ + /datum/computer_file/program/maintenance/theme/spooky, // 2 GQ + /datum/computer_file/program/ntnet_dos, // 20 GQ + /datum/computer_file/program/revelation, // 13 GQ + /datum/computer_file/program/ai_restorer, // 12 GQ + /datum/computer_file/program/ntnetmonitor, // 12 GQ + ) diff --git a/modular_doppler/loadout_categories/categories/pockets.dm b/modular_doppler/loadout_categories/categories/pockets.dm index 5fc9805326749..50e30a54527a4 100644 --- a/modular_doppler/loadout_categories/categories/pockets.dm +++ b/modular_doppler/loadout_categories/categories/pockets.dm @@ -108,6 +108,14 @@ name = "Rag" item_path = /obj/item/reagent_containers/cup/rag +/datum/loadout_item/pocket_items/mod_painter + name = "MOD Paint Kit" + item_path = /obj/item/mod/paint + +/datum/loadout_item/pocket_items/super_disk + name = "Bootleg Computer Programs Disk" + item_path = /obj/item/computer_disk/all_of_them + /datum/loadout_item/pocket_items/london name = "Switchblade" item_path = /obj/item/switchblade From fb5dd53460a22ed31c25963d8d38b378ce3b3137 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Thu, 19 Dec 2024 14:17:03 -0600 Subject: [PATCH 11/14] makes tech visor reskinning and glasses colors less painful --- modular_doppler/super_glasses/code/techno_visors.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modular_doppler/super_glasses/code/techno_visors.dm b/modular_doppler/super_glasses/code/techno_visors.dm index c397c74400722..b951cd65db4c9 100644 --- a/modular_doppler/super_glasses/code/techno_visors.dm +++ b/modular_doppler/super_glasses/code/techno_visors.dm @@ -40,3 +40,10 @@ /obj/item/clothing/glasses/techno_visor/Initialize(mapload) . = ..() AddComponent(/datum/component/glasses_stats_thief) + +/obj/item/clothing/glasses/techno_visor/change_glass_color(new_color_type) + if(glass_colour_type) + RemoveElement(/datum/element/wearable_client_colour, glass_colour_type, ITEM_SLOT_EYES, forced = forced_glass_color, comsig_toggle = COMSIG_CLICK_CTRL) + glass_colour_type = new_color_type + if(glass_colour_type) + AddElement(/datum/element/wearable_client_colour, glass_colour_type, ITEM_SLOT_EYES, forced = forced_glass_color, comsig_toggle = COMSIG_CLICK_CTRL) From 80a8a877cbde8ca8a64313b51185fc5635a2b1b9 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Sat, 21 Dec 2024 03:53:07 -0600 Subject: [PATCH 12/14] makes the disk desc funnier than it was before, and random --- .../epic_loot/code/loot_items/electronics.dm | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/modular_doppler/epic_loot/code/loot_items/electronics.dm b/modular_doppler/epic_loot/code/loot_items/electronics.dm index 3c72b52530412..c144fa7da23e0 100644 --- a/modular_doppler/epic_loot/code/loot_items/electronics.dm +++ b/modular_doppler/epic_loot/code/loot_items/electronics.dm @@ -143,8 +143,6 @@ ) /obj/item/computer_disk/all_of_them - desc = "Removable disk used to store data. This one has a strange slogan printed on the label: \ - 'We steam, Steamapps, COMMON'. Whatever that might mean." max_capacity = 128 starting_programs = list( /datum/computer_file/program/arcade/eazy, // 6 GQ @@ -167,3 +165,23 @@ /datum/computer_file/program/ai_restorer, // 12 GQ /datum/computer_file/program/ntnetmonitor, // 12 GQ ) + /// List of random things that will be mentioned in the desc + var/list/hackerman_bits = list( + "Some Tunes", + "钱", + "Software Testing Prototype", + "CLASSIFIED", + "Free Download", + "!! EVIL VIRUS !!", + "📸", + ">;3", + "@AOL.com", + "$$$", + "Comedy", + "For Whom The Bell Tolls", + ) + +/obj/item/computer_disk/all_of_them/Initialize(mapload) + . = ..() + desc = "Removable disk used to store data, with a paper label adhered to the side. \ + This one has '[pick(hackerman_bits)]' ominously written on it." From 426318cce23fde1fda4e6b2b1dde2267ddfb29e2 Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Mon, 23 Dec 2024 12:33:00 -0600 Subject: [PATCH 13/14] fixes some stuff --- .../loadout_categories/categories/heads.dm | 4 ---- .../code/hats/doppler_command_hats.dm | 2 +- .../code/neck/doppler_command_mantles.dm | 2 +- .../icons/mob/head/doppler_command_hats.dmi | Bin 2538 -> 2541 bytes .../icons/mob/neck/doppler_mantles.dmi | Bin 2584 -> 2587 bytes .../obj/head/doppler_command_hardhats.dmi | Bin 1832 -> 1835 bytes .../icons/obj/head/doppler_command_hats.dmi | Bin 1580 -> 1583 bytes .../icons/obj/neck/doppler_mantles.dmi | Bin 1121 -> 1124 bytes 8 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modular_doppler/loadout_categories/categories/heads.dm b/modular_doppler/loadout_categories/categories/heads.dm index 37c795b84dfde..252fd5044f049 100644 --- a/modular_doppler/loadout_categories/categories/heads.dm +++ b/modular_doppler/loadout_categories/categories/heads.dm @@ -94,10 +94,6 @@ name = "Slim Beret (Light)" item_path = /obj/item/clothing/head/beret/doppler_command/light -/datum/loadout_item/head/hardhat_black - name = "Heavy-Duty Hardhat" - item_path = /obj/item/clothing/head/utility/hardhat/welding/doppler_command - /datum/loadout_item/head/breach_helmet name = "Breach Helmet" item_path = /obj/item/clothing/head/utility/hardhat/welding/doppler_dc diff --git a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm index d449b947e4309..903773d669863 100644 --- a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm +++ b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm @@ -70,7 +70,7 @@ desc = "A slim beret denoting the wearer as the command for some aspect of the station." icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi' - icon_state = null + icon_state = "dark"" icon_preview = null dog_fashion = null greyscale_config = null diff --git a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm index 5bc48ec1b12e6..26d1021ac06de 100644 --- a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm +++ b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm @@ -3,7 +3,7 @@ desc = "A command mantle made of fire and acid proof materials to protect the wearer." icon = 'modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi' - icon_state = "" + icon_state = "dark" inhand_icon_state = null w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|ARMS diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi index 57fe4deb827d5c023bd2acf0e459c7045b05b818..7d1d695931fc289fcb202bdc51bd24d39ad7b182 100644 GIT binary patch delta 45 zcmaDQ{8o5^3gfhis*SQ?vm>VX1_bhHa1^c#3M=?p%y^uMVFE`fFDZ*Bkpc$}5d%?iRW3gy@HfBw!wakw#?Ue)uTx3Er0kWgrsGcei$d#T}Qe=i0BfT>_0d+is3!$Lcma)%C3I6n1b^rhX delta 183 zcmV;o07(Cv6qpo{B!8lMR9JLGWpiV4X>fFDZ*Bkpc$}5dO$x#=5C!0Ma*EKd75}zw zq(!>0SCEj5$v~5oOsLnl(WOY@?mhShhM87e`s*-??l$lRB4P02EKb`UXHV40uH|^( z%mNylK82D@u*OD*d7dEN9q5KLjgj&wXOAcyfFDZ*Bkpc$}5eu?oU45C-5md5X~PlB%nV zv`7d03LzwC60{9mLi_p#y9r`$yE{Jq;pbX$9d6?!`uoUNz!c&lF5-NUoNd8oUzXF6 zGY`S}ye}#13}tM*M(cH!Y6jbIW&@^j?l^m(o?)NAaYw;YB|8)9lL=TVSX_NF0ZU~x zx>%o0;w611bWOmeYcPbaEAR#{yM`3;ue2JUzfdcNssH@v8#Wup@V0B!8}YR9JLGWpiV4X>fFDZ*Bkpc$}5eu?oW=5C-5`pF)zon6_(| zk`OX9uOOmV6`BaAB(Gm-wnC}5-5nqQ@N=!W592h8{xR_lFon2^o4B4NXM3>Om*sNi z%tLTKA4|$QLm3;d(R!VwTEI4(*?_5>JI%gt$~GE4cc(fMWpwfI@UXH>WPmvA}Ev Df$kA? delta 42 zcmV+_0M-Am46F>0Bmt9=C4m~MC8!_=6nwZ;DJ!`8xqxE;0EXsrop6-$;IYGO1zSWC A9{>OV diff --git a/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi b/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi index 1f77c6cb62155a7d90d3453862bdeb44e0ec6401..ba53e792898b65e7d57b5e8320a5faff085104ae 100644 GIT binary patch delta 45 zcmV+|0Mh^A2;>NmBmtI@C4n8QO)SbLs3->%gt$~GE4cc(fMWpwfI@UXH>WPmvB04N DlQt3x delta 42 zcmV+_0M-BG2;m5jBmt9=C4m~MC8!_=6nwZ;DJ!`8xqxE;0EXsrop6-$;IYG@18Zgy Av;Y7A From 59fe98204c10483354d25e8c56930a6279dcbd6d Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Mon, 23 Dec 2024 12:43:11 -0600 Subject: [PATCH 14/14] , --- .../modular_cosmetics/code/hats/doppler_command_hats.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm index 903773d669863..1e7766c766328 100644 --- a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm +++ b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm @@ -70,7 +70,7 @@ desc = "A slim beret denoting the wearer as the command for some aspect of the station." icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi' - icon_state = "dark"" + icon_state = "dark" icon_preview = null dog_fashion = null greyscale_config = null