From 831ad1c4a4acff92933bdf38a7f0f2d9bd080ae6 Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Wed, 1 Jan 2025 12:50:06 -0600 Subject: [PATCH] makes the loadout selection less bleak (#293) * its peak * s * d * fixes some weird stuff * techno visor * adds red reskin * fake var * s * v * crazy pulls * makes tech visor reskinning and glasses colors less painful * makes the disk desc funnier than it was before, and random * fixes some stuff * , --- code/modules/clothing/suits/bio.dm | 4 +- code/modules/loadout/categories/heads.dm | 8 +- code/modules/loadout/categories/pocket.dm | 8 +- .../epic_loot/code/loot_items/electronics.dm | 44 +++ .../categories/backpacks.dm | 12 + .../loadout_categories/categories/belts.dm | 50 +--- .../loadout_categories/categories/clothing.dm | 261 ++++-------------- .../loadout_categories/categories/glasses.dm | 16 +- .../loadout_categories/categories/gloves.dm | 12 + .../loadout_categories/categories/heads.dm | 46 ++- .../loadout_categories/categories/inhands.dm | 24 +- .../loadout_categories/categories/masks.dm | 16 +- .../loadout_categories/categories/neck.dm | 8 + .../loadout_categories/categories/pockets.dm | 126 +++++---- .../loadout_categories/categories/shoes.dm | 28 +- .../categories/undersuit.dm | 97 +++---- .../code/hats/doppler_command_hats.dm | 20 +- .../code/neck/doppler_command_mantles.dm | 17 +- .../modular_cosmetics/code/shoes/baseshoes.dm | 2 + .../icons/mob/head/doppler_command_hats.dmi | Bin 2271 -> 2541 bytes .../icons/mob/neck/doppler_mantles.dmi | Bin 2454 -> 2587 bytes .../obj/head/doppler_command_hardhats.dmi | Bin 1832 -> 1835 bytes .../icons/obj/head/doppler_command_hats.dmi | Bin 1503 -> 1583 bytes .../icons/obj/neck/doppler_mantles.dmi | Bin 1057 -> 1124 bytes .../super_glasses/code/glasses_stats_thief.dm | 45 +++ .../super_glasses/code/techno_visors.dm | 49 ++++ .../super_glasses/icons/visors.dmi | Bin 0 -> 1174 bytes .../super_glasses/icons/worn/visors.dmi | Bin 0 -> 1255 bytes tgstation.dme | 2 + 29 files changed, 460 insertions(+), 435 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/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/code/modules/loadout/categories/heads.dm b/code/modules/loadout/categories/heads.dm index 69ef68cfff193..86858b3aff1a4 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,9 +124,9 @@ 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 + item_path = /obj/item/clothing/head/bio_hood/plague */ /datum/loadout_item/head/rose name = "Rose" diff --git a/code/modules/loadout/categories/pocket.dm b/code/modules/loadout/categories/pocket.dm index b9a03e2068dd4..ac42c29407299 100644 --- a/code/modules/loadout/categories/pocket.dm +++ b/code/modules/loadout/categories/pocket.dm @@ -84,7 +84,7 @@ 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/epic_loot/code/loot_items/electronics.dm b/modular_doppler/epic_loot/code/loot_items/electronics.dm index 5719a1ed842e6..c144fa7da23e0 100644 --- a/modular_doppler/epic_loot/code/loot_items/electronics.dm +++ b/modular_doppler/epic_loot/code/loot_items/electronics.dm @@ -141,3 +141,47 @@ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 2, ) + +/obj/item/computer_disk/all_of_them + 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 + ) + /// 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." 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..b7457015a32d6 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_alt + 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..709214df1492b 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,24 +263,43 @@ 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 +* FAMILIES */ +/datum/loadout_item/suit/tmc + name = "TMC Coat" + item_path = /obj/item/clothing/suit/costume/tmc + +/datum/loadout_item/suit/pg + name = "PG Coat" + item_path = /obj/item/clothing/suit/costume/pg + +/datum/loadout_item/suit/deckers + name = "Deckers Hoodie" + item_path = /obj/item/clothing/suit/costume/deckers + +/datum/loadout_item/suit/soviet + name = "Soviet Coat" + item_path = /obj/item/clothing/suit/costume/soviet + +/datum/loadout_item/suit/yuri + name = "Yuri Coat" + item_path = /obj/item/clothing/suit/costume/yuri + +/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 @@ -386,20 +337,6 @@ 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" @@ -413,109 +350,15 @@ /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" + name = "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 -*/ - -/datum/loadout_item/suit/tmc - name = "TMC Coat" - item_path = /obj/item/clothing/suit/costume/tmc - -/datum/loadout_item/suit/pg - name = "PG Coat" - item_path = /obj/item/clothing/suit/costume/pg - -/datum/loadout_item/suit/deckers - name = "Deckers Hoodie" - item_path = /obj/item/clothing/suit/costume/deckers - -/datum/loadout_item/suit/soviet - name = "Soviet Coat" - item_path = /obj/item/clothing/suit/costume/soviet - -/datum/loadout_item/suit/yuri - 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 diff --git a/modular_doppler/loadout_categories/categories/glasses.dm b/modular_doppler/loadout_categories/categories/glasses.dm index ca4fe95fac706..50d99accf50c0 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,15 @@ /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 + +/datum/loadout_item/glasses/techno_visor + name = "Techno-Visor" + item_path = /obj/item/clothing/glasses/techno_visor 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..252fd5044f049 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,23 @@ /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/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 a0b565b87de46..8ddf6b254ec10 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..50e30a54527a4 100644 --- a/modular_doppler/loadout_categories/categories/pockets.dm +++ b/modular_doppler/loadout_categories/categories/pockets.dm @@ -48,22 +48,6 @@ if(!equipper.equip_to_slot_if_possible(wallet, slot = ITEM_SLOT_BACKPACK, initial = TRUE)) wallet.forceMove(equipper.drop_location()) -/* -* GUM -*/ - -/datum/loadout_item/pocket_items/gum_pack - name = "Pack of Gum" - item_path = /obj/item/storage/box/gum - -/datum/loadout_item/pocket_items/gum_pack_nicotine - name = "Pack of Nicotine Gum" - item_path = /obj/item/storage/box/gum/nicotine - -/datum/loadout_item/pocket_items/gum_pack_hp - name = "Pack of HP+ Gum" - item_path = /obj/item/storage/box/gum/happiness - /* * LIPSTICK */ @@ -96,6 +80,26 @@ name = "Red Lipstick" item_path = /obj/item/lipstick +/* +* GUM +*/ + +/datum/loadout_item/pocket_items/gum_pack + name = "Pack of Gum" + item_path = /obj/item/storage/box/gum + +/datum/loadout_item/pocket_items/gum_pack_nicotine + name = "Pack of Nicotine Gum" + item_path = /obj/item/storage/box/gum/nicotine + +/datum/loadout_item/pocket_items/gum_pack_hp + name = "Pack of HP+ Gum" + item_path = /obj/item/storage/box/gum/happiness + +/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 +108,33 @@ 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/mod_painter + name = "MOD Paint Kit" + item_path = /obj/item/mod/paint -/datum/loadout_item/pocket_items/matches - name = "Matchbox" - item_path = /obj/item/storage/box/matches +/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 + +/datum/loadout_item/pocket_items/london_two + name = "Survival Knife" + item_path = /obj/item/knife/combat/survival + +/datum/loadout_item/pocket_items/injector_case + name = "Autoinjector Case" + item_path = /obj/item/storage/epic_loot_medpen_case + +/datum/loadout_item/pocket_items/docs_case + name = "Documents Case" + item_path = /obj/item/storage/epic_loot_docs_case + +/datum/loadout_item/pocket_items/org_case + name = "Organizational Pouch" + item_path = /obj/item/storage/epic_loot_org_pouch /datum/loadout_item/pocket_items/cheaplighter name = "Cheap Lighter" @@ -120,10 +144,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 +200,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 +210,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 +224,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 +251,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..f2904165eaa95 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -66,8 +66,7 @@ */ /datum/loadout_item/undersuit/pants - name = "Pants" - item_path = /obj/item/clothing/under/pants + abstract_type = /datum/loadout_item/undersuit/pants /datum/loadout_item/undersuit/pants/shorts name = "Shorts" @@ -153,14 +152,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 @@ -190,8 +181,7 @@ */ /datum/loadout_item/undersuit/buttondown - name = "Buttondown" - item_path = /obj/item/clothing/under/costume/buttondown + abstract_type = /datum/loadout_item/undersuit/buttondown /datum/loadout_item/undersuit/buttondown/slacks name = "Buttondown w/ Slacks" @@ -211,8 +201,7 @@ */ /datum/loadout_item/undersuit/dress - name = "Dress" - item_path = /obj/item/clothing/under/dress + abstract_type = /datum/loadout_item/undersuit/dress /datum/loadout_item/undersuit/dress/giantscarf name = "Giant Scarf" @@ -246,10 +235,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 @@ -289,49 +274,13 @@ 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 */ @@ -348,10 +297,48 @@ 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 +/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/detective_suit + name = "Hard-Worn Suit" + item_path = /obj/item/clothing/under/rank/security/detective + +/datum/loadout_item/undersuit/noir_suit + 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/aerostatic + 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..1e7766c766328 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,50 +19,58 @@ 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' - icon_state = null + icon_state = "dark" icon_preview = null dog_fashion = null greyscale_config = null @@ -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..26d1021ac06de 100644 --- a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm +++ b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm @@ -1,39 +1,50 @@ /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' - icon_state = "" + icon_state = "dark" inhand_icon_state = null 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/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/icons/mob/head/doppler_command_hats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi index c2ac9f2de5f7de93f320ef382e4b2a5ea7932768..7d1d695931fc289fcb202bdc51bd24d39ad7b182 100644 GIT binary patch delta 2220 zcmV;d2vhgp5$zL@7Y@J(1^@s6Qrv6@0001%ktKnDR-0IqO;Aw|CQdV&Fa{vVcD4`utM~P%Dx(-3&;;PcYq%y`I zxCG-iFm8WHmXK_2iw+ryGsY1SSr#1oLu1UA%s4leGy$_YvlSx0)VUESBNb>9%uouf zCDWyUgBj2IdD?G$yzQLl(C6HHd)}|)i*^$!Z&j z-|17Xr?)%v=VaB=+?q5_pW)B<464%UV3hy z+x6@(a*w}c`PY)RW$pfa^IdB*$DfqtkJj9OKRcN-r`hRfzu|g6Axg-sgGfVh6i;z& z3>r@!v5gYnlK;l95BlTtcg)J=8YqT+Z!G{i^fQeoc5HLU%lvM%(R?=<-HXO8u{?xU~yb0xyaYMjJejcnDomCvkbYjO{N zKGKvt@koF4)i7N3hrjc2*HYg!bPQdSztt*!%h7Czf3jymPwKl-s$bU1yW+NY zT+hG>*ZGrwk9uE;5xW4C0G5C{mzCdtzSt+>Gf&k{`Su0Ij?iZ8_=w{?E7E?vHnkdS8VQy8wAYn{<6wCARuiTV?dfaGpw~YF}dawENYocBa2YtT9 z2@j1&uX^<}h1rFr&<4|~(+9eb=XRC9m)3o#MqKUI5lV@*)? z=E*=SRk%vFzB{p5#>smiXZ{ zxb@`i$!8yaGPeW_=l|iWhx^fXPP#2Q@a{*dZvImjKv?yfh=0?2j{4Trv!-0_&Mmu4 z7a;9NrlK!;@12`nX%dV`Vitiee%E)03;z2R)F1z$jz*Vs+?{l6Jrz9xOXuI6-0Q9# zihpg#&^0-HMb*uJssgYt|GwZuufJdX8-H3lF|k-*c*V1Xu%E>=oa9H{%UykL`_u3B z$5-sIZ+%QEI#I<5zw@oDuJTE!@x@HQvF8808+z^enLn?_`A=0XVgL7F)hpX`aNe{6 z>z3bn=w0{VZ=b3ueJ}Q7m?dE8WUrd{X}5CTBzMnWYog9W(dQqNAp;$MV4P*{=eY2? z#lBBu-|17Xr?)%zzK|`=tx4nb;ZDu_UwpnSeJL9n8k72|_5M81YY<-hyknb*vOmJ4 zEPu3R#Wl&CIn7Q-`wiFo2~k339Yh+6qj-vIW6*f=h;5Ykmi%ky*7@VhSGMMI4HUz^ zw-x{$`kBTPJGMFY^CsVaqhH6yZR>q8C?WHRtvHIOxHbljC+p{>YLBi9{nM{b_vf8m zy{`M{YyMn`FtQpaF;^p7^=;)dt2-`nzni}(`PQ#aM_&!YRe$(9zvbr5zr-IWx@r_Z zW_UMncEIgB@Pd!6A}Epc_xDBJpP+NoIe-3m1?`WpVM)6?d(b6+D>qz}`fil!m$mZ# zpd)dIUVYnb+W*F=_mvp23qT2A38-_~uyCeNz#k4JV9duMOa9X2TYY(tf6c1^^%@qT z76iK%F$+K|?}jB^?#wIu+_L*-jCx;%5W4`veHg4w{BsYSa?=*HyG^?~Qa=u*`eh}c zZuc)88Fbr^ynmuWEjeROfF+! zFMCe7uRP%@W`Bf-zHrceW>J&-#?u|_QDx8zr|R2{!w<8tW{uNc-BUahiq=w}*F?AYd;ElVnDe*}#ukJu*MA7OdT zC;ZVmbADCskC1AA00~$9;hykazBTo-1SG!i@EaUjl)EW5RJ2(5-DuNP8%?2nTn108<=P(3pDbEH51#ORNoRk%k(Ir_q?CBF5h-F(;DeD?>?1XNOgd`pPD zg#Gcu9`)7OA3qBvzwObmaoc+T?>zQ~5XDhE#kDb5F=ml!e*j%*C7v9sp#JzH36ZF8 zeD3}6-;3|BNwxLIPeaM4#FHI6_qy#{AM@uyr|=}^-N1iVecKtx3>U(oMEgdhji0Ij zY{J9j7fnjow>~DtRh+OVyx58uGXeise|%F~n6cRRR=m>w_%YcdN0|Jgy%}`ao((Z6 zuHuAyLWu1c6m^3Zd;A#dR-eahSf6ik!sCO+HQw<{W9IqzS8n$BG1lWw9@|vu^DRzz ze9*W6005ID0~&vot}JcEE6MKNyURTUlu@eYxTVyW(Hf%W*&{yeO`mscOe~oSz?z^2 zZL!7wEOs)g0jfFymq^qpxcBvg6arF7y+MYp`eE|hMhQVNM59DkA9%Iswha;#SL2D@ zofs2Osyl!szY=bYRe03K1+iFPc*U~~6T)8cz=xIUks%yhVZ%E>x%P<~5Bw*%*s3yV u#}frmY?(I6111WSj|e%FjtCtWwEqH$AT97gm`XYT0000(0001uktKnDREtZ2vVyCh3pi{6DUWCT!7unj z000OLNkl` zHh)A#Byq+#BO=D=+#fE+Y{`tev80Kb%^5931pKuTCz1-Z35zHNY{_(~FymQ2Py58< zEz5R)4m{88?RmeFlY7$J-tTjt^Zh>Oz#reo3@EUgyni_N;`xbQdk^fl?w+pPpOaTh zb8FH#d5SyV^7b3i<4Z$BV^Tk{-krysgY?|Tj_s{_>?t>fcV69W8(#Tc^!N)F|2Sz| z)b7sL-f?s8_~Y{Y(Te-0Co^U=n~wHNFL4)tL?fS@_D-niQ<0Ry2t?{+^k_ z^r7)+T%jL9(lPy`Sj@-2N>c*raih(y9`SwkUh^5}2b~9fzK@eWG#-sB)?*lxu?HQ0 zz;SX+jYQR#(KjlM*&{yPn?82zqm7}O`{N&rv2gt}wMX}S6I6Zq?`;~|q~c$8buxbO z_}~+v3$LE=Wn9x{+SCPUG=(u5C=Bxa;>SSO*qdEFFH*Vko6-o(HFh^QUPu79Qi z@L&F0!3SUeGXIb6wEV(^;`_oYo=*t>vyg_8e3!k~*=y@x_@+O;VyFAohoquXQ=Ig7 zzGm6EE(tZhkO_FS>wm-sU%P+f&a3hIXR4NT|M%3YSFz{d*t7!cmfx}cYkTNV&()N_ z7y2>GCt&%-UN-9-TRLl;-Tn8Ppx2@3*B_Iy2OWRlILqD7aqh+QU7yI_1N*JJrz?72 z$d=~Tq;c|4r{*nhzfqCClno7yN&UoncOG*N(sLg>wl`MxM;MpqkJc?YKbbM3*>tpD zdWpLrO31u}$U<=xPjUSiG@cl-Jte+R{+nmkx#QZiTBFQ?V)*Z^1we;>rtyT1?d|?; zlk0!cuj9cdSGi(PLdJ-#IEtsZeheB<-p|X_9$gdttLrAa^N!9Q>)Q2^J69qMuf|Ep z)yS{*&Smx7sV)J3F_?fMABTMMmnYxyGrHYttOC?)x(Kx(__+vK09tuhFX*&` z?{Bt6_e~k`z6v390i^d~@NME>ePF*$n$vD;Hk2|y4rTgfC7^Ei@9Z3~^*g_Pp?yGd zhP(hi0sY1Hu9#GBZD-ZlQ#%HNCSdw8BX!rS*uR5fQvyD{tkeFsX|Mh085=eGBRqWN zHoIV6ll|m{68jXBu?HQ0fNF9~eH4AKMv2*zG2NR!c5ILR5yr;;2)XtLP~!XKSF=V z7oi@7e9P>R1)!C8<)J!z?W-g9eE*IS?^kMngyr=!T@oq*E3rSq()T`fudxbHug7bD zgvHHtu?HQ0RfcwU z1-EhI#!3&NqH?uI7d48F*%rKwblYj|W6##kmhU@L86~6!g002ovPDHLkV1g8&Bmn>b 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..2b73e3fd3973b493782134429d25c8101ad3f7a4 100644 GIT binary patch literal 2587 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 RTYmj9cNZ^bg46k%{{hIl3QYh2 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_hardhats.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi index 5e66911e261376a1d55dd2778d6ffe14fd183a24..a38391ec7021fa52c7d6e1bd4abb2e3438bac5f0 100644 GIT binary patch delta 198 zcmV;%06G7t4yz83B!97bR9JLGWpiV4X>fFDZ*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>JIpKoMi_NH(k+i`spHY)xil^Bo6K;yoj^N-IL%5xUJ=2-_Gln_d2>d+#~-cfRNRzQ6DJo!|ML@8`>g&}7M4z?@9&1Y*TG zgSNwEN5INS^=MuFdLbj;4+w}q6=97mJ^BFvkVZS&o<#qax9|Xi-DkJ2MJLPSHWBL^ zKZJz(l^pYOvQ6uL*%(~i)s`Wh^qngLC_X#AE$5*Ct(Hl$l=3W$e2mkxbI zdEG9VPB;DlldX+$#HP9T21oLd#FkP2XgXympE34r4b;A%m0rMGG-RmfR`2t7a)=Kl2L6{mVYLllizao3jwQC+q{j}C+A1fZ9 znbY8@UecY6HR%P7>Tjzf*GQF1y)vHsE@Omfv@ZjQIq>9s8qwMMke`gn`;`sViG*bs z1k2#M)Ko98m?|d2GjW4#iQpv=!Ei8jpVP7%+)35v~hevPO>+>6_x#I2b{sLQP49r9cMeDp(lgX4IU}V@LNb zcak-VxaRgPu3B)s2$C-^X{9mWF6u;oi6UrjCV2G(i|tAaIhIcLe3Cua#b1p zatE}l*k6hQmo0L=UOt~Cy}$0pbjp0Tf`6h>lKsgw&Q$9BRd3Mg&)x(z`fNd;sK!zy zQ|&D!Aa>+2$E2UJT4mrlyaACIINSNZn|wtyW7BnG>*J8^)eDG}^`IMi2TgfwC!H$h z*N|UBLI^H3jmda+gv8SAoSoQ^il$pdJ-shH{_IH+0*kvcHBzw}ct2QAz0s@`XJH)K z9W0)q?b<2~H%>IL__cCIxI`b^oMF=eA*buKhQ>Ig`LN6`rZbO^d*lBoV>kCak^f%m zBykMi^u<+x3MDN3uBF6U9k$5f@N@C|bw`wRQsMOZ$L`$70>Ws?X3l`VK*(?wwzzxwxd^X8^iF7beVOHXC7vrFbv+Az-ba0i=q$S>-Z zD{L%Lip;6JYG`!DS4FXDaqj6hD&pgehuCRBp-@q>n9OaBtKtFmxHL=dS%2#b>wtTL z=mP@tn7m~1U?*6H3;9{ccP*R(l^^dqkVcezIgg4L8nPtgE3iK|v}c*2sQ7faQj+Ge zUG%B)wj3z@P^;8snT*5&tNczLaBP$K9d3!Y&f0zv*BywmX zT}ouN&WSU$qINe0N+#@LTb=h5s7&%wa_M5jo!l^a9@;kW5hW~x2ZYud_?15?3u3zl zc#f>cBk7ad7#y_y(7-$WxiAUR-MbC#)^jubO&k4$7}*IXl6NMGu(KU(D~-tQzn_(l zt*KL1oZW0h^u7y3!MFU@LdIk9Z5P_7{RCgD5H8pB&&#|MO LlWo;0pTxfbhat(A delta 1359 zcmZuvc~H^`7{$<(O$S9+?Qm%owG3BtQcEH{Yr~`3G_|d;By}@mGfETkr$h&uMv^6B z;e|$rOloR*o93}zo2z&s4z{Uzf@^?W>(;jWPv5+mZ{9cGA8+1!JbmFhIzlV$j&(Bd zxP{{$+SuQtv#A1P5f?ex9^Z`yfpiS^dwT@N=ghHiXH9}k-Vpq?XxJ$GpACu(>=7aB zifG&>yF4E~sQWvg-bc`tQzEcU;ZN`#dtts?#Er7BQ%VLs5C*aKymcf5`^_GtH|2P= zy}-pq@7%~iN){!*V6w#3FLHj66ba1F`d11an4M=)aosr!EK)@AgV*MuFXP_0g_e-i zf4k)TDEmTq0TT5GTwe8fHbHuItGMrY@eqyou_sH$ISJ+uAmi-JtOwt6oJ(;_jFi5c zMQJ^#w2c{Oe|z5wo@o7r%9X`UtxcSMcIJiys)Hly>uEEm_`LbXtAQ z`G!j2__$#`)X+HC*7D(43|<7(zRxApJEZ4`E@sJII)o$Z{FMDe2P|8Ios!O#dn#v} z9g-C~W;%l;zicJkM;ak#k3Mt1D~@$ZJ*rmEMx1wNmUU~6xw6}_hej&z7l!*wb;(ue7Ca~FH48Ew zV$6F~y(A2Y#V|7Sdu&z;!-GDlGuEC?R%Qa^QDA|5Or?dVj8{J-Gk%Us|3r00hBZm_VT6Rf@8myysw*?Fp$uP8wiO%oJl%)CgV*O4Iy6zMci16x*Y&J8&<4>c4q8a$f&;RidTq^sT{%1JKq*IF}q>9GLldv7QV z-ZWFt4F>lC{ZqjGJ^|h(o?(=~0T3IT8UO$Q 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..ba53e792898b65e7d57b5e8320a5faff085104ae 100644 GIT binary patch delta 947 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 Z##=excuU{jFaj1d44$rjF6*2UngGDsFuMQ% literal 0 HcmV?d00001 diff --git a/modular_doppler/super_glasses/icons/worn/visors.dmi b/modular_doppler/super_glasses/icons/worn/visors.dmi new file mode 100644 index 0000000000000000000000000000000000000000..72f5532af47501fdf3fc0281f0dff7bcaf43c3d4 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 literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 9563f0a136fd3..bccea8255f37a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7222,6 +7222,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"