From 33aeffd25ba729398d5883280203fe8b5d33ba7c Mon Sep 17 00:00:00 2001
From: Cursor <102828457+theselfish@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:59:14 +0100
Subject: [PATCH] Killing the Module Folder with a Chainsaw and taking it's
skin for a mask. (#1624)
## About The Pull Request
Title. This WILL break shit. Probably. Help me sweet Jesus.
## Why It's Good For The Game
House of Leaves is less confusing than our file structure.
## Proof Of Testing
## Changelog
:cl:
fix: MASSIVE File Structure clean-up.
/:cl:
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
---
.../modules/borgs/code/robot_items.dm | 2 +-
.../game/objects/items/robot/items/storage.dm | 4 +-
.../nightmare/nightmare_species.dm | 0
.../modules/arcades/assets/arcade.dm | 0
.../code/loot/arcade_weights_classic.dm | 0
.../code/loot/arcade_weights_mechanical.dm | 0
.../code/loot/arcade_weights_oh_god.dm | 0
.../code/loot/arcade_weights_special.dm | 0
.../arcades/code/loot/arcade_weights_toy.dm | 0
.../arcades/code/minesweeper/minesweeper.dm | 0
.../arcades/code/overrides/spawners.dm | 0
.../ashwalker_names.dm | 0
.../ashwalkers/code/effects/ash_rituals.dm | 0
.../automapper/code/area_spawn_entries.dm | 5 +-
.../code/overrides/area_spawn_subsystem.dm | 0
.../modules/blooper/atoms_movable.dm | 0
.../{ => code}/modules/blooper/bark.dm | 0
.../{ => code}/modules/blooper/bark_list.dm | 90 +++----
.../blooper/voice/bababooey/bababooey.ogg | Bin
.../blooper/voice/bababooey/bababooey2.ogg | Bin
.../blooper/voice/bababooey/babafooey.ogg | Bin
.../blooper/voice/bababooey/fafafoggy.ogg | Bin
.../blooper/voice/bababooey/fafafoggy2.ogg | Bin
.../blooper/voice/bababooey/fafafooey.ogg | Bin
.../blooper/voice/bababooey/fafafooey2.ogg | Bin
.../blooper/voice/bababooey/fafafooey3.ogg | Bin
.../modules/blooper/voice/bababooey/ffff.ogg | Bin
.../blooper/voice/bababooey/ffffhvh.ogg | Bin
.../blooper/voice/bababooey/hohohoy.ogg | Bin
.../modules/blooper/voice/bloopers/caw.ogg | Bin
.../modules/blooper/voice/bloopers/chirp.ogg | Bin
.../blooper/voice/bloopers/chitter.ogg | Bin
.../bloopers/dont_starve/wilson_blooper.ogg | Bin
.../bloopers/dont_starve/wolfgang_blooper.ogg | Bin
.../bloopers/dont_starve/woodie_blooper.ogg | Bin
.../bloopers/dont_starve/wurt_blooper.ogg | Bin
.../bloopers/dont_starve/wx78_blooper.ogg | Bin
.../voice/bloopers/kazooie/birdwhistle.ogg | Bin
.../voice/bloopers/kazooie/birdwhistle2.ogg | Bin
.../blooper/voice/bloopers/kazooie/caw.ogg | Bin
.../blooper/voice/bloopers/kazooie/caw2.ogg | Bin
.../blooper/voice/bloopers/kazooie/caw3.ogg | Bin
.../voice/bloopers/kazooie/chitter1.ogg | Bin
.../blooper/voice/bloopers/kazooie/dwoop.ogg | Bin
.../blooper/voice/bloopers/kazooie/ehh.ogg | Bin
.../blooper/voice/bloopers/kazooie/ehh2.ogg | Bin
.../blooper/voice/bloopers/kazooie/ehh3.ogg | Bin
.../blooper/voice/bloopers/kazooie/ehh4.ogg | Bin
.../blooper/voice/bloopers/kazooie/ehh5.ogg | Bin
.../blooper/voice/bloopers/kazooie/faucet.ogg | Bin
.../voice/bloopers/kazooie/faucet2.ogg | Bin
.../blooper/voice/bloopers/kazooie/hoot.ogg | Bin
.../blooper/voice/bloopers/kazooie/ribbit.ogg | Bin
.../blooper/voice/bloopers/kazooie/tweet.ogg | Bin
.../blooper/voice/bloopers/kazooie/uhm.ogg | Bin
.../voice/bloopers/kazooie/wurble1.ogg | Bin
.../modules/blooper/voice/bloopers/meow1.ogg | Bin
.../voice/bloopers/moth/mothchitter2.ogg | Bin
.../blooper/voice/bloopers/mothsqueak.ogg | Bin
.../voice/bloopers/undertale/voice_alphys.ogg | Bin
.../voice/bloopers/undertale/voice_asgore.ogg | Bin
.../bloopers/undertale/voice_flowey_1.ogg | Bin
.../bloopers/undertale/voice_flowey_2.ogg | Bin
.../bloopers/undertale/voice_gaster_1.ogg | Bin
.../bloopers/undertale/voice_gaster_2.ogg | Bin
.../bloopers/undertale/voice_gaster_3.ogg | Bin
.../bloopers/undertale/voice_gaster_4.ogg | Bin
.../bloopers/undertale/voice_gaster_5.ogg | Bin
.../bloopers/undertale/voice_gaster_6.ogg | Bin
.../bloopers/undertale/voice_gaster_7.ogg | Bin
.../bloopers/undertale/voice_metta_1.ogg | Bin
.../bloopers/undertale/voice_monster1.ogg | Bin
.../bloopers/undertale/voice_monster2.ogg | Bin
.../bloopers/undertale/voice_papyrus.ogg | Bin
.../voice/bloopers/undertale/voice_ralsei.ogg | Bin
.../voice/bloopers/undertale/voice_sans.ogg | Bin
.../voice/bloopers/undertale/voice_susie.ogg | Bin
.../voice/bloopers/undertale/voice_temmie.ogg | Bin
.../voice/bloopers/undertale/voice_toriel.ogg | Bin
.../voice/bloopers/undertale/voice_undyne.ogg | Bin
.../modules/borgs/code/robot_defense.dm | 0
.../code/modules/borgs/code/robot_defines.dm | 101 ++++++++
.../modules/borgs/code/robot_items.dm | 0
.../modules/borgs/code/robot_model.dm | 2 +-
.../modules/borgs/code/robot_upgrade.dm | 0
.../modules/borgs/sprites/felibot_all.dmi | Bin
.../modules/borgs/sprites/largerobot_cc.dmi | Bin
.../modules/borgs/sprites/largerobot_eng.dmi | Bin
.../modules/borgs/sprites/largerobot_jani.dmi | Bin
.../modules/borgs/sprites/largerobot_med.dmi | Bin
.../modules/borgs/sprites/largerobot_mine.dmi | Bin
.../modules/borgs/sprites/largerobot_pk.dmi | Bin
.../modules/borgs/sprites/largerobot_sci.dmi | Bin
.../modules/borgs/sprites/largerobot_sec.dmi | Bin
.../modules/borgs/sprites/largerobot_serv.dmi | Bin
.../borgs/sprites/largerobot_syndie.dmi | Bin
.../modules/borgs/sprites/robot_items.dmi | Bin
.../modules/borgs/sprites/robot_sci.dmi | Bin
.../modules/borgs/sprites/screen_robot.dmi | Bin
.../sprites/smallraptors/smolraptor_car.dmi | Bin
.../sprites/smallraptors/smolraptor_cc.dmi | Bin
.../sprites/smallraptors/smolraptor_eng.dmi | Bin
.../sprites/smallraptors/smolraptor_gen.dmi | Bin
.../sprites/smallraptors/smolraptor_jani.dmi | Bin
.../sprites/smallraptors/smolraptor_med.dmi | Bin
.../sprites/smallraptors/smolraptor_min.dmi | Bin
.../sprites/smallraptors/smolraptor_pk.dmi | Bin
.../sprites/smallraptors/smolraptor_sci.dmi | Bin
.../sprites/smallraptors/smolraptor_serv.dmi | Bin
.../modules/borgs/sprites/tallrobot_pk.dmi | Bin
.../modules/borgs/sprites/tallrobot_sci.dmi | Bin
.../modules/borgs/sprites/tallrobot_sec.dmi | Bin
.../modules/borgs/sprites/widerobot_cc.dmi | Bin
.../modules/borgs/sprites/widerobot_clown.dmi | Bin
.../modules/borgs/sprites/widerobot_mine.dmi | Bin
.../modules/borgs/sprites/widerobot_sci.dmi | Bin
.../borgs/sprites/widerobot_syndie.dmi | Bin
.../bubber_tram/code/moonstation_tram.dm | 6 +-
.../bubber_tram/icons/tram_controls.dmi | Bin
.../bubber_tram/icons/tram_display.dmi | Bin
.../bubber_tram/icons/tram_indicator.dmi | Bin
.../modules/client}/chat_color.dm | 0
.../modules/client}/examine_tgui.dm | 0
.../modules/client/flavor_text/flavor_text.dm | 0
.../client/preferences}/preferences.dm | 0
.../code => code/modules/client}/ssd.dm | 0
.../modules/jobs => clothing}/_job.dm | 0
.../clothing/armor_overrides/hos_armor.dm | 0
.../modules/clothing/donator_clothing.dm} | 46 ++--
.../modules/clothing}/gloves/clown.dm | 0
.../code/modules/clothing/head/helmet.dm | 47 ++++
.../modules/clothing}/mask/clown.dm | 13 +
.../modules/clothing/shoes}/clown.dm | 0
.../modules/clothing/under}/clown.dm | 0
.../modules => }/clothing/under/security.dm | 0
.../code/modules/clothing/under/syndicate.dm | 16 ++
.../code/modules/clothing/undershirt.dm | 14 +
.../fabricator_flag_additions/tools.dm | 0
.../modules/designs/limbgrower_designs.dm | 7 +
.../code => code/modules/emotes}/emotes.dm | 14 +-
.../emotes/sound/synth_voice/synth_error.ogg | Bin
.../emotes/sound/synth_voice/synth_scary.ogg | Bin
.../sound/synth_voice/synth_shutdown.ogg | Bin
.../sound/synth_voice/synth_startup.ogg | Bin
.../modules/emotes/sound/voice/caw.ogg | Bin
.../modules/emotes/sound/voice/caw2.ogg | Bin
.../modules/emotes/sound/voice/chirp.ogg | Bin
.../modules/emotes/sound/voice/fox_purr.ogg | Bin
.../modules/emotes/sound/voice/foxgecker.ogg | Bin
.../modules/emotes/sound/voice/mrrp.ogg | Bin
.../modules/emotes/sound/voice/prbt.ogg | Bin
.../modules/emotes}/synth_emotes.dm | 8 +-
.../ert_overrides/modified_equipement.dm | 0
.../game/objects/items/gladiator_items.dm | 0
.../modules/hacks/atmos/force_atmos.dm | 0
.../modules/hydroponics/code/grown/rocks.dm | 10 +-
.../code/plantgenes/hydroponics.dm | 0
.../hydroponics/icons/growing_fruits.dmi | Bin
.../modules/hydroponics/icons/harvest.dmi | Bin
.../modules/hydroponics/icons/seeds.dmi | Bin
.../{ => code}/modules/hydroponics/readme.txt | 0
.../modules/job_exempt/job_exempt.dm | 0
.../modules/jobs/job_types/quartermaster.dm | 2 +
.../modules/jobs}/job_types/warden.dm | 0
.../code => code/modules/jobs}/trims/jobs.dm | 0
.../modules/languages}/_language_holder.dm | 0
.../modules/languages}/common.dm | 0
.../modules/languages}/nekomimetic.dm | 0
.../modules/languages}/panslavic.dm | 0
.../modules/languages}/piratespeak.dm | 0
.../modules/languages}/siikmaas.dm | 0
.../loadout_items/loadout_datum_masks.dm | 3 +
.../loadout_items/loadout_datum_under.dm | 8 +
.../modules/lunchbox/code/lunchbox.dm | 6 +-
.../modules/lunchbox/icons/lunchbox.dmi | Bin
.../lunchbox/icons/lunchbox_lefthand.dmi | Bin
.../lunchbox/icons/lunchbox_righthand.dmi | Bin
.../modules/mapping}/ss13_construct/areas.dm | 0
.../new_player/sprite_accessories/fluff.dm | 0
.../new_player/sprite_accessories/hair.dm | 0
.../new_player/sprite_accessories/horns.dm | 2 +-
.../dead/new_player/sprite_accessories/ipc.dm | 0
.../sprite_accessories/skrell_hair.dm | 0
.../new_player/sprite_accessories/wings.dm | 2 +-
.../modules/mob/dead/taur_types.dm | 0
.../mob/living/carbon/human/species/akula.dm | 0
.../living/carbon/human/species/tajaran.dm | 0
.../mob/living/carbon/human/species/xeno.dm | 0
.../mod_suits => code/modules/mod}/modules.dm | 0
.../modules/modular_items/code/cake_light.dm | 0
.../code/food_and_drinks/food/meatslab.dm | 0
.../modules/modular_items/code/necklace.dm | 0
.../modular_items/code/recipes_misc.dm | 0
.../company_and_or_faction_based/carwo.dm | 0
.../carwo_defense_systems/ammo/ammobox.dm | 0
.../carwo_defense_systems/ammo/carwo.dm | 0
.../saibasan/laser_guns.dm | 10 +-
.../saibasan/mode_datums.dm | 0
.../saibasan/projectiles.dm | 16 +-
.../szot_dynamica/magazines.dm | 0
.../szot_dynamica/pistol.dm | 0
.../trappiste_fabriek/ammo.dm | 0
.../modules/modular_weapons/code/gunsets.dm | 0
.../saibasan/guns_lefthand.dmi | Bin
.../saibasan/guns_righthand.dmi | Bin
.../saibasan/guns_worn.dmi | Bin
.../saibasan/guns32x.dmi | Bin
.../saibasan/guns48x.dmi | Bin
.../saibasan/projectiles.dmi | Bin
.../modular_weapons/sounds/grenade_burst.ogg | Bin
.../sounds/laser_firing/burn.ogg | Bin
.../sounds/laser_firing/incinerate.ogg | Bin
.../sounds/laser_firing/laser.ogg | Bin
.../sounds/laser_firing/melt.ogg | Bin
.../sounds/laser_firing/vaporize.ogg | Bin
.../more_crushers/code/miningweapons.dm | 30 +--
.../modules/more_crushers/icons/back.dmi | Bin
.../modules/more_crushers/icons/belt.dmi | Bin
.../more_crushers/icons/items_and_weapons.dmi | Bin
.../more_crushers/icons/melee_lefthand.dmi | Bin
.../more_crushers/icons/melee_righthand.dmi | Bin
.../modules/pollution/code/perfumes.dm | 0
.../pollution/code/pollutants_generic.dm | 0
.../modules/public_logging/public_logging.dm | 0
.../{ => code}/modules/quirks/code/_quirk.dm | 0
.../code/negative_quirks/sensitive_snout.dm | 0
.../code/negative_quirks/sol_weakness.dm | 0
.../quirks/code/neutral_quirks/hungry.dm | 0
.../quirks/code/neutral_quirks/waddle.dm | 0
.../code/modules/research/techweb/_techweb.dm | 2 -
.../modules/security/secmed/automapper.dm | 0
.../secmed/icons/secmed_equipment.dmi | Bin
.../modules/security/secmed/secmed_clothes.dm | 0
.../modules/security/secmed/security_medic.dm | 4 +-
.../modules/security}/security_glock/ammo.dm | 0
.../modules/security}/security_glock/cargo.dm | 0
.../modules/security}/security_glock/case.dm | 0
.../security}/security_glock/firing_pin.dm | 0
.../modules/security}/security_glock/gun.dm | 0
.../security}/security_glock/lockers.dm | 0
.../security}/security_glock/research.dm | 0
.../{ => code}/modules/shelves/shelf.dm | 0
.../modules/space_background/parallax.dm | 0
.../modules/space_background/turf_space.dm | 0
.../{ => code}/modules/stone/code/stone.dm | 0
.../synths/code/designs/exofab_designs.dm | 0
.../modules/synths/code/synth_prefab.dm | 0
.../{ => code}/modules/synths/death_sound.dm | 0
.../code/title_screen_subsystem.dm | 0
.../vending.dm => vending/comdrobe.dm} | 0
.../code/modules/vending/megaseed.dm | 10 +
.../{ => code}/modules/vending/vending.dm | 0
.../{ => code}/modules/vending/wardrobe.dm | 0
.../{ => code}/modules/vetted/examine.dm | 0
.../vetted/overrides/erp_preferences.dm | 0
.../{ => code}/modules/vetted/vetted.dm | 0
.../{ => code}/modules/voting/_votes.dm | 0
.../{ => code}/modules/voting/living_timer.dm | 0
.../modules/voting/vote_overrides.dm | 0
.../customization}/mutant_bodyparts.dmi | Bin
.../icons => icons/customization}/wings.dmi | Bin
.../code/loot/~arcade_weights_final.dm | 8 -
.../automapper/code/area_spawn_entries.dm | 2 -
.../modules/borgs/code/robot_defines.dm | 101 --------
.../modules/clothing/code/donator_clothing.dm | 4 -
.../modules/clothing/code/head/helmet.dm | 46 ----
.../sprite_accessories/sprite_accessories.dm | 13 -
.../modules/hemophages/code/limbgrower.dm | 6 -
.../hydroponics/code/vending/megaseed.dm | 6 -
.../jobs/code/job_types/quartermaster.dm | 2 -
.../unsorted_clothes.dm | 40 ---
tgstation.dme | 241 +++++++++---------
272 files changed, 471 insertions(+), 478 deletions(-)
rename modular_zubbers/{ => code}/modules/antagonists/nightmare/nightmare_species.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/assets/arcade.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/loot/arcade_weights_classic.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/loot/arcade_weights_mechanical.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/loot/arcade_weights_oh_god.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/loot/arcade_weights_special.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/loot/arcade_weights_toy.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/minesweeper/minesweeper.dm (100%)
rename modular_zubbers/{ => code}/modules/arcades/code/overrides/spawners.dm (100%)
rename modular_zubbers/code/modules/{ashwalker_names => ashwalkers}/ashwalker_names.dm (100%)
rename modular_zubbers/{ => code}/modules/ashwalkers/code/effects/ash_rituals.dm (100%)
rename modular_zubbers/{ => code}/modules/automapper/code/overrides/area_spawn_subsystem.dm (100%)
rename modular_zubbers/{ => code}/modules/blooper/atoms_movable.dm (100%)
rename modular_zubbers/{ => code}/modules/blooper/bark.dm (100%)
rename modular_zubbers/{ => code}/modules/blooper/bark_list.dm (63%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/bababooey.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/bababooey2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/babafooey.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/fafafoggy.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/fafafoggy2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/fafafooey.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/fafafooey2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/fafafooey3.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/ffff.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/ffffhvh.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bababooey/hohohoy.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/caw.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/chirp.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/chitter.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/caw.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/caw2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/caw3.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/chitter1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/dwoop.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/ehh.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/ehh2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/ehh3.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/ehh4.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/ehh5.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/faucet.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/faucet2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/hoot.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/ribbit.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/tweet.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/uhm.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/kazooie/wurble1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/meow1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/moth/mothchitter2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/mothsqueak.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_3.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_4.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_5.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_6.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_gaster_7.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_sans.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_susie.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg (100%)
rename modular_zubbers/{ => code}/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg (100%)
rename modular_zubbers/{ => code}/modules/borgs/code/robot_defense.dm (100%)
create mode 100644 modular_zubbers/code/modules/borgs/code/robot_defines.dm
rename modular_zubbers/{ => code}/modules/borgs/code/robot_items.dm (100%)
rename modular_zubbers/{ => code}/modules/borgs/code/robot_model.dm (99%)
rename modular_zubbers/{ => code}/modules/borgs/code/robot_upgrade.dm (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/felibot_all.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_cc.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_eng.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_jani.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_med.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_mine.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_pk.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_sci.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_sec.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_serv.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/largerobot_syndie.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/robot_items.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/robot_sci.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/screen_robot.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_car.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_med.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_min.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/tallrobot_pk.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/tallrobot_sci.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/tallrobot_sec.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/widerobot_cc.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/widerobot_clown.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/widerobot_mine.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/widerobot_sci.dmi (100%)
rename modular_zubbers/{ => code}/modules/borgs/sprites/widerobot_syndie.dmi (100%)
rename modular_zubbers/{ => code}/modules/bubber_tram/code/moonstation_tram.dm (90%)
rename modular_zubbers/{ => code}/modules/bubber_tram/icons/tram_controls.dmi (100%)
rename modular_zubbers/{ => code}/modules/bubber_tram/icons/tram_display.dmi (100%)
rename modular_zubbers/{ => code}/modules/bubber_tram/icons/tram_indicator.dmi (100%)
rename modular_zubbers/{modules/client/code => code/modules/client}/chat_color.dm (100%)
rename modular_zubbers/{modules/examine => code/modules/client}/examine_tgui.dm (100%)
rename modular_zubbers/{ => code}/modules/client/flavor_text/flavor_text.dm (100%)
rename modular_zubbers/{modules/client/code => code/modules/client/preferences}/preferences.dm (100%)
rename modular_zubbers/{modules/client/code => code/modules/client}/ssd.dm (100%)
rename modular_zubbers/code/modules/{customization/modules/jobs => clothing}/_job.dm (100%)
rename modular_zubbers/{ => code}/modules/clothing/armor_overrides/hos_armor.dm (100%)
rename modular_zubbers/{modules/modular_items/code/idmaco_donator.dm => code/modules/clothing/donator_clothing.dm} (71%)
rename modular_zubbers/{modules/clothing/code => code/modules/clothing}/gloves/clown.dm (100%)
rename modular_zubbers/{modules/clothing/code => code/modules/clothing}/mask/clown.dm (68%)
rename modular_zubbers/{modules/clothing/code/feet => code/modules/clothing/shoes}/clown.dm (100%)
rename modular_zubbers/{modules/clothing/code/uniform => code/modules/clothing/under}/clown.dm (100%)
rename modular_zubbers/code/modules/{customization/modules => }/clothing/under/security.dm (100%)
rename modular_zubbers/{ => code}/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/tools.dm (100%)
rename modular_zubbers/{modules/emotes/code => code/modules/emotes}/emotes.dm (74%)
rename modular_zubbers/{ => code}/modules/emotes/sound/synth_voice/synth_error.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/synth_voice/synth_scary.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/synth_voice/synth_shutdown.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/synth_voice/synth_startup.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/caw.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/caw2.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/chirp.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/fox_purr.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/foxgecker.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/mrrp.ogg (100%)
rename modular_zubbers/{ => code}/modules/emotes/sound/voice/prbt.ogg (100%)
rename modular_zubbers/{modules/emotes/code => code/modules/emotes}/synth_emotes.dm (68%)
rename modular_zubbers/{ => code}/modules/ert_overrides/modified_equipement.dm (100%)
rename modular_zubbers/{ => code}/modules/gladiator/code/game/objects/items/gladiator_items.dm (100%)
rename modular_zubbers/{ => code}/modules/hacks/atmos/force_atmos.dm (100%)
rename modular_zubbers/{ => code}/modules/hydroponics/code/grown/rocks.dm (88%)
rename modular_zubbers/{ => code}/modules/hydroponics/code/plantgenes/hydroponics.dm (100%)
rename modular_zubbers/{ => code}/modules/hydroponics/icons/growing_fruits.dmi (100%)
rename modular_zubbers/{ => code}/modules/hydroponics/icons/harvest.dmi (100%)
rename modular_zubbers/{ => code}/modules/hydroponics/icons/seeds.dmi (100%)
rename modular_zubbers/{ => code}/modules/hydroponics/readme.txt (100%)
rename modular_zubbers/{ => code}/modules/job_exempt/job_exempt.dm (100%)
create mode 100644 modular_zubbers/code/modules/jobs/job_types/quartermaster.dm
rename modular_zubbers/{modules/jobs/code => code/modules/jobs}/job_types/warden.dm (100%)
rename modular_zubbers/{modules/jobs/code => code/modules/jobs}/trims/jobs.dm (100%)
rename modular_zubbers/{modules/customization/modules/language => code/modules/languages}/_language_holder.dm (100%)
rename modular_zubbers/{modules/customization/modules/language => code/modules/languages}/common.dm (100%)
rename modular_zubbers/{modules/customization/modules/language => code/modules/languages}/nekomimetic.dm (100%)
rename modular_zubbers/{modules/customization/modules/language => code/modules/languages}/panslavic.dm (100%)
rename modular_zubbers/{modules/customization/modules/language => code/modules/languages}/piratespeak.dm (100%)
rename modular_zubbers/{modules/customization/modules/language => code/modules/languages}/siikmaas.dm (100%)
create mode 100644 modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_masks.dm
rename modular_zubbers/{ => code}/modules/lunchbox/code/lunchbox.dm (86%)
rename modular_zubbers/{ => code}/modules/lunchbox/icons/lunchbox.dmi (100%)
rename modular_zubbers/{ => code}/modules/lunchbox/icons/lunchbox_lefthand.dmi (100%)
rename modular_zubbers/{ => code}/modules/lunchbox/icons/lunchbox_righthand.dmi (100%)
rename modular_zubbers/{modules/mapping/modules => code/modules/mapping}/ss13_construct/areas.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/new_player/sprite_accessories/fluff.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/new_player/sprite_accessories/hair.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/new_player/sprite_accessories/horns.dm (79%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/new_player/sprite_accessories/ipc.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/new_player/sprite_accessories/wings.dm (83%)
rename modular_zubbers/{modules/customization => code}/modules/mob/dead/taur_types.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/living/carbon/human/species/akula.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/living/carbon/human/species/tajaran.dm (100%)
rename modular_zubbers/{modules/customization => code}/modules/mob/living/carbon/human/species/xeno.dm (100%)
rename modular_zubbers/{modules/mod_suits => code/modules/mod}/modules.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_items/code/cake_light.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_items/code/food_and_drinks/food/meatslab.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_items/code/necklace.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_items/code/recipes_misc.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/carwo.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/ammobox.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/carwo.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm (95%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm (90%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/ammo.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/code/gunsets.dm (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/sounds/grenade_burst.ogg (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/sounds/laser_firing/burn.ogg (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/sounds/laser_firing/incinerate.ogg (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/sounds/laser_firing/laser.ogg (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/sounds/laser_firing/melt.ogg (100%)
rename modular_zubbers/{ => code}/modules/modular_weapons/sounds/laser_firing/vaporize.ogg (100%)
rename modular_zubbers/{ => code}/modules/more_crushers/code/miningweapons.dm (84%)
rename modular_zubbers/{ => code}/modules/more_crushers/icons/back.dmi (100%)
rename modular_zubbers/{ => code}/modules/more_crushers/icons/belt.dmi (100%)
rename modular_zubbers/{ => code}/modules/more_crushers/icons/items_and_weapons.dmi (100%)
rename modular_zubbers/{ => code}/modules/more_crushers/icons/melee_lefthand.dmi (100%)
rename modular_zubbers/{ => code}/modules/more_crushers/icons/melee_righthand.dmi (100%)
rename modular_zubbers/{ => code}/modules/pollution/code/perfumes.dm (100%)
rename modular_zubbers/{ => code}/modules/pollution/code/pollutants_generic.dm (100%)
rename modular_zubbers/{ => code}/modules/public_logging/public_logging.dm (100%)
rename modular_zubbers/{ => code}/modules/quirks/code/_quirk.dm (100%)
rename modular_zubbers/{ => code}/modules/quirks/code/negative_quirks/sensitive_snout.dm (100%)
rename modular_zubbers/{ => code}/modules/quirks/code/negative_quirks/sol_weakness.dm (100%)
rename modular_zubbers/{ => code}/modules/quirks/code/neutral_quirks/hungry.dm (100%)
rename modular_zubbers/{ => code}/modules/quirks/code/neutral_quirks/waddle.dm (100%)
delete mode 100644 modular_zubbers/code/modules/research/techweb/_techweb.dm
rename modular_zubbers/{ => code}/modules/security/secmed/automapper.dm (100%)
rename modular_zubbers/{ => code}/modules/security/secmed/icons/secmed_equipment.dmi (100%)
rename modular_zubbers/{ => code}/modules/security/secmed/secmed_clothes.dm (100%)
rename modular_zubbers/{ => code}/modules/security/secmed/security_medic.dm (97%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/ammo.dm (100%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/cargo.dm (100%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/case.dm (100%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/firing_pin.dm (100%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/gun.dm (100%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/lockers.dm (100%)
rename modular_zubbers/{modules => code/modules/security}/security_glock/research.dm (100%)
rename modular_zubbers/{ => code}/modules/shelves/shelf.dm (100%)
rename modular_zubbers/{ => code}/modules/space_background/parallax.dm (100%)
rename modular_zubbers/{ => code}/modules/space_background/turf_space.dm (100%)
rename modular_zubbers/{ => code}/modules/stone/code/stone.dm (100%)
rename modular_zubbers/{ => code}/modules/synths/code/designs/exofab_designs.dm (100%)
rename modular_zubbers/{ => code}/modules/synths/code/synth_prefab.dm (100%)
rename modular_zubbers/{ => code}/modules/synths/death_sound.dm (100%)
rename modular_zubbers/{ => code}/modules/title_screen/code/title_screen_subsystem.dm (100%)
rename modular_zubbers/code/modules/{command_vendor/vending.dm => vending/comdrobe.dm} (100%)
create mode 100644 modular_zubbers/code/modules/vending/megaseed.dm
rename modular_zubbers/{ => code}/modules/vending/vending.dm (100%)
rename modular_zubbers/{ => code}/modules/vending/wardrobe.dm (100%)
rename modular_zubbers/{ => code}/modules/vetted/examine.dm (100%)
rename modular_zubbers/{ => code}/modules/vetted/overrides/erp_preferences.dm (100%)
rename modular_zubbers/{ => code}/modules/vetted/vetted.dm (100%)
rename modular_zubbers/{ => code}/modules/voting/_votes.dm (100%)
rename modular_zubbers/{ => code}/modules/voting/living_timer.dm (100%)
rename modular_zubbers/{ => code}/modules/voting/vote_overrides.dm (100%)
rename modular_zubbers/{modules/customization/icons => icons/customization}/mutant_bodyparts.dmi (100%)
rename modular_zubbers/{modules/customization/icons => icons/customization}/wings.dmi (100%)
delete mode 100644 modular_zubbers/modules/arcades/code/loot/~arcade_weights_final.dm
delete mode 100644 modular_zubbers/modules/automapper/code/area_spawn_entries.dm
delete mode 100644 modular_zubbers/modules/borgs/code/robot_defines.dm
delete mode 100644 modular_zubbers/modules/clothing/code/donator_clothing.dm
delete mode 100644 modular_zubbers/modules/clothing/code/head/helmet.dm
delete mode 100644 modular_zubbers/modules/clothing/code/sprite_accessories/sprite_accessories.dm
delete mode 100644 modular_zubbers/modules/hemophages/code/limbgrower.dm
delete mode 100644 modular_zubbers/modules/hydroponics/code/vending/megaseed.dm
delete mode 100644 modular_zubbers/modules/jobs/code/job_types/quartermaster.dm
delete mode 100644 modular_zubbers/modules/normalized_syndie_clothing_4_tesh/unsorted_clothes.dm
diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm
index f457d3f6437..55cee15a184 100644
--- a/modular_skyrat/modules/borgs/code/robot_items.dm
+++ b/modular_skyrat/modules/borgs/code/robot_items.dm
@@ -610,7 +610,7 @@
"Syndicate" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "synd_sec"),
"Spider Clan" = image(icon = CYBORG_ICON_NINJA, icon_state = "ninja_engi"),
//Bubber addition start
- "Research" = image(icon = 'modular_zubbers/modules/borgs/sprites/robot_sci.dmi', icon_state = "research"),
+ "Research" = image(icon = 'modular_zubbers/code/modules/borgs/sprites/robot_sci.dmi', icon_state = "research"),
//Bubber addition end
))
var/model_selection = show_radial_menu(user, user, model_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 42, require_near = TRUE)
diff --git a/modular_zubbers/code/game/objects/items/robot/items/storage.dm b/modular_zubbers/code/game/objects/items/robot/items/storage.dm
index 817c4e08b5d..b34e30271b4 100644
--- a/modular_zubbers/code/game/objects/items/robot/items/storage.dm
+++ b/modular_zubbers/code/game/objects/items/robot/items/storage.dm
@@ -8,7 +8,7 @@
/obj/item/borg/apparatus/research
name = "Research manipulation gripper"
desc = "A simple grasping tool suited to assist in a wide array of research applications."
- icon = 'modular_zubbers/modules/borgs/sprites/robot_items.dmi'
+ icon = 'modular_zubbers/code/modules/borgs/sprites/robot_items.dmi'
icon_state = "gripper_sci"
storable = list(
/obj/item/slime_extract,
@@ -35,7 +35,7 @@
/obj/item/borg/apparatus/circuit_sci
name = "Research circuit assembly gripper"
desc = "A complex grasping tool used for working with circuitry."
- icon = 'modular_zubbers/modules/borgs/sprites/robot_items.dmi'
+ icon = 'modular_zubbers/code/modules/borgs/sprites/robot_items.dmi'
icon_state = "gripper_circ"
storable = list(
/obj/item/circuitboard,
diff --git a/modular_zubbers/modules/antagonists/nightmare/nightmare_species.dm b/modular_zubbers/code/modules/antagonists/nightmare/nightmare_species.dm
similarity index 100%
rename from modular_zubbers/modules/antagonists/nightmare/nightmare_species.dm
rename to modular_zubbers/code/modules/antagonists/nightmare/nightmare_species.dm
diff --git a/modular_zubbers/modules/arcades/assets/arcade.dm b/modular_zubbers/code/modules/arcades/assets/arcade.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/assets/arcade.dm
rename to modular_zubbers/code/modules/arcades/assets/arcade.dm
diff --git a/modular_zubbers/modules/arcades/code/loot/arcade_weights_classic.dm b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_classic.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/loot/arcade_weights_classic.dm
rename to modular_zubbers/code/modules/arcades/code/loot/arcade_weights_classic.dm
diff --git a/modular_zubbers/modules/arcades/code/loot/arcade_weights_mechanical.dm b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_mechanical.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/loot/arcade_weights_mechanical.dm
rename to modular_zubbers/code/modules/arcades/code/loot/arcade_weights_mechanical.dm
diff --git a/modular_zubbers/modules/arcades/code/loot/arcade_weights_oh_god.dm b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_oh_god.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/loot/arcade_weights_oh_god.dm
rename to modular_zubbers/code/modules/arcades/code/loot/arcade_weights_oh_god.dm
diff --git a/modular_zubbers/modules/arcades/code/loot/arcade_weights_special.dm b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_special.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/loot/arcade_weights_special.dm
rename to modular_zubbers/code/modules/arcades/code/loot/arcade_weights_special.dm
diff --git a/modular_zubbers/modules/arcades/code/loot/arcade_weights_toy.dm b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_toy.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/loot/arcade_weights_toy.dm
rename to modular_zubbers/code/modules/arcades/code/loot/arcade_weights_toy.dm
diff --git a/modular_zubbers/modules/arcades/code/minesweeper/minesweeper.dm b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/minesweeper/minesweeper.dm
rename to modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm
diff --git a/modular_zubbers/modules/arcades/code/overrides/spawners.dm b/modular_zubbers/code/modules/arcades/code/overrides/spawners.dm
similarity index 100%
rename from modular_zubbers/modules/arcades/code/overrides/spawners.dm
rename to modular_zubbers/code/modules/arcades/code/overrides/spawners.dm
diff --git a/modular_zubbers/code/modules/ashwalker_names/ashwalker_names.dm b/modular_zubbers/code/modules/ashwalkers/ashwalker_names.dm
similarity index 100%
rename from modular_zubbers/code/modules/ashwalker_names/ashwalker_names.dm
rename to modular_zubbers/code/modules/ashwalkers/ashwalker_names.dm
diff --git a/modular_zubbers/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_zubbers/code/modules/ashwalkers/code/effects/ash_rituals.dm
similarity index 100%
rename from modular_zubbers/modules/ashwalkers/code/effects/ash_rituals.dm
rename to modular_zubbers/code/modules/ashwalkers/code/effects/ash_rituals.dm
diff --git a/modular_zubbers/code/modules/automapper/code/area_spawn_entries.dm b/modular_zubbers/code/modules/automapper/code/area_spawn_entries.dm
index f30da0d6ea5..54cc51c29d7 100644
--- a/modular_zubbers/code/modules/automapper/code/area_spawn_entries.dm
+++ b/modular_zubbers/code/modules/automapper/code/area_spawn_entries.dm
@@ -1,3 +1,6 @@
/datum/area_spawn/secmed_landmark
target_areas = list(/area/station/security/medical, /area/station/security/brig)
- desired_atom = /obj/effect/landmark/start/security_medic
\ No newline at end of file
+ desired_atom = /obj/effect/landmark/start/security_medic
+
+/datum/area_spawn/lustwish_prison
+ desired_atom = /obj/machinery/vending/dorms/prison // PRISON LUSTWISH
diff --git a/modular_zubbers/modules/automapper/code/overrides/area_spawn_subsystem.dm b/modular_zubbers/code/modules/automapper/code/overrides/area_spawn_subsystem.dm
similarity index 100%
rename from modular_zubbers/modules/automapper/code/overrides/area_spawn_subsystem.dm
rename to modular_zubbers/code/modules/automapper/code/overrides/area_spawn_subsystem.dm
diff --git a/modular_zubbers/modules/blooper/atoms_movable.dm b/modular_zubbers/code/modules/blooper/atoms_movable.dm
similarity index 100%
rename from modular_zubbers/modules/blooper/atoms_movable.dm
rename to modular_zubbers/code/modules/blooper/atoms_movable.dm
diff --git a/modular_zubbers/modules/blooper/bark.dm b/modular_zubbers/code/modules/blooper/bark.dm
similarity index 100%
rename from modular_zubbers/modules/blooper/bark.dm
rename to modular_zubbers/code/modules/blooper/bark.dm
diff --git a/modular_zubbers/modules/blooper/bark_list.dm b/modular_zubbers/code/modules/blooper/bark_list.dm
similarity index 63%
rename from modular_zubbers/modules/blooper/bark_list.dm
rename to modular_zubbers/code/modules/blooper/bark_list.dm
index 43ba4f474e2..6702fee9f01 100644
--- a/modular_zubbers/modules/blooper/bark_list.dm
+++ b/modular_zubbers/code/modules/blooper/bark_list.dm
@@ -45,7 +45,7 @@
name = "Chittery"
id = "chitter"
minspeed = 4 //Even with the sound being replaced with a unique, shorter sound, this is still a little too long for higher speeds
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/chitter.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/chitter.ogg'
/datum/blooper/synthetic_grunt
name = "Synthetic (Grunt)"
@@ -71,7 +71,7 @@
/datum/blooper/moff/short
name = "Moff squeak"
id = "moffsqueak"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/mothsqueak.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/mothsqueak.ogg'
allow_random = TRUE
ignore = FALSE
@@ -79,7 +79,7 @@
name = "Meow"
id = "meow"
allow_random = TRUE
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/meow1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/meow1.ogg'
minspeed = 5
maxspeed = 11
@@ -87,134 +87,134 @@
name = "Chirp"
id = "chirp"
allow_random = TRUE
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/chirp.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/chirp.ogg'
/datum/blooper/caw
name = "Caw"
id = "caw"
allow_random = TRUE
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/caw.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/caw.ogg'
//Undertale
/datum/blooper/alphys
name = "Alphys"
id = "alphys"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg'
minvariance = 0
/datum/blooper/asgore
name = "Asgore"
id = "asgore"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg'
minvariance = 0
/datum/blooper/flowey
name = "Flowey (normal)"
id = "flowey1"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg'
minvariance = 0
/datum/blooper/flowey/evil
name = "Flowey (evil)"
id = "flowey2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg'
minvariance = 0
/datum/blooper/papyrus
name = "Papyrus"
id = "papyrus"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg'
minvariance = 0
/datum/blooper/ralsei
name = "Ralsei"
id = "ralsei"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg'
minvariance = 0
/datum/blooper/sans //real
name = "Sans"
id = "sans"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_sans.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_sans.ogg'
minvariance = 0
/datum/blooper/toriel
name = "Toriel"
id = "toriel"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg'
minvariance = 0
maxpitch = BLOOPER_DEFAULT_MAXPITCH*2
/datum/blooper/undyne
name = "Undyne"
id = "undyne"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg'
minvariance = 0
/datum/blooper/temmie
name = "Temmie"
id = "temmie"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg'
minvariance = 0
/datum/blooper/susie
name = "Susie"
id = "susie"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_susie.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_susie.ogg'
minvariance = 0
/datum/blooper/gaster
name = "Gaster"
id = "gaster"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg'
minvariance = 0
/datum/blooper/mettaton
name = "Mettaton"
id = "mettaton"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg'
minvariance = 0
/datum/blooper/gen_monster
name = "Generic Monster 1"
id = "gen_monster_1"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg'
minvariance = 0
/datum/blooper/gen_monster/alt
name = "Generic Monster 2"
id = "gen_monster_2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg'
minvariance = 0
/datum/blooper/wilson
name = "Wilson"
id = "wilson"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg'
/datum/blooper/wolfgang
name = "Wolfgang"
id = "wolfgang"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg'
minspeed = 4
maxspeed = 10
/datum/blooper/woodie
name = "Woodie"
id = "woodie"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg'
minspeed = 4
maxspeed = 10
/datum/blooper/wurt
name = "Wurt"
id = "wurt"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg'
/datum/blooper/wx78
name = "wx78"
id = "wx78"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg'
minspeed = 3
maxspeed = 9
@@ -318,114 +318,114 @@
/datum/blooper/chitter/alt
name = "Chittery Alt"
id = "chitter2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/moth/mothchitter2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/moth/mothchitter2.ogg'
// The Mayhem Special
/datum/blooper/whistle
name = "Whistle 1"
id = "whistle1"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg'
/datum/blooper/whistle/alt1
name = "Whistle 2"
id = "whistle2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg'
/datum/blooper/caw/alt1
name = "Caw 2"
id = "caw2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw.ogg'
minspeed = 4
maxspeed = 9
/datum/blooper/caw/alt2
name = "Caw 3"
id = "caw3"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw2.ogg'
minspeed = 3
maxspeed = 9
/datum/blooper/caw/alt3
name = "Caw 4"
id = "caw4"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw3.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw3.ogg'
minspeed = 3
maxspeed = 9
/datum/blooper/ehh
name = "Ehh 1"
id = "ehh1"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh.ogg'
minspeed = 3
maxspeed = 9
/datum/blooper/ehh/alt1
name = "Ehh 2"
id = "ehh2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh2.ogg'
/datum/blooper/ehh/alt2
name = "Ehh 3"
id = "ehh3"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh3.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh3.ogg'
/datum/blooper/ehh/alt3
name = "Ehh 4"
id = "ehh4"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh4.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh4.ogg'
minspeed = 3
maxspeed = 9
/datum/blooper/ehh/alt5
name = "Ehh 5"
id = "ehh5"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh5.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh5.ogg'
/datum/blooper/faucet
name = "Faucet 1"
id = "faucet1"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/faucet.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/faucet.ogg'
/datum/blooper/faucet/alt1
name = "Faucet 2"
id = "faucet2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/faucet2.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/faucet2.ogg'
/datum/blooper/ribbit
name = "Ribbit"
id = "ribbit"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/ribbit.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ribbit.ogg'
/datum/blooper/hoot
name = "Hoot"
id = "hoot"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/hoot.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/hoot.ogg'
minspeed = 4
maxspeed = 9
/datum/blooper/tweet
name = "Tweet"
id = "tweet"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/tweet.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/tweet.ogg'
/datum/blooper/dwoop
name = "Dwoop"
id = "dwoop"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/dwoop.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/dwoop.ogg'
minspeed = 3
maxspeed = 9
/datum/blooper/uhm
name = "Uhm"
id = "uhm"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/uhm.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/uhm.ogg'
/datum/blooper/wurtesh
name = "Wurtesh"
id = "wurtesh"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/wurble1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/wurble1.ogg'
/datum/blooper/chitter2
name = "Chitter2"
id = "chitter2"
- soundpath = 'modular_zubbers/modules/blooper/voice/bloopers/kazooie/chitter1.ogg'
+ soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/chitter1.ogg'
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/bababooey.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/bababooey.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/bababooey.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/bababooey.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/bababooey2.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/bababooey2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/bababooey2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/bababooey2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/babafooey.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/babafooey.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/babafooey.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/babafooey.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/fafafoggy.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/fafafoggy.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/fafafoggy.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/fafafoggy.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/fafafoggy2.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/fafafoggy2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/fafafoggy2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/fafafoggy2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/fafafooey.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/fafafooey.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/fafafooey.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/fafafooey.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/fafafooey2.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/fafafooey2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/fafafooey2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/fafafooey2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/fafafooey3.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/fafafooey3.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/fafafooey3.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/fafafooey3.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/ffff.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/ffff.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/ffff.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/ffff.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/ffffhvh.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/ffffhvh.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/ffffhvh.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/ffffhvh.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bababooey/hohohoy.ogg b/modular_zubbers/code/modules/blooper/voice/bababooey/hohohoy.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bababooey/hohohoy.ogg
rename to modular_zubbers/code/modules/blooper/voice/bababooey/hohohoy.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/caw.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/caw.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/caw.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/caw.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/chirp.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/chirp.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/chirp.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/chirp.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/chitter.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/chitter.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/chitter.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/chitter.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wilson_blooper.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wolfgang_blooper.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/woodie_blooper.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wurt_blooper.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/dont_starve/wx78_blooper.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/birdwhistle.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/birdwhistle2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw3.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw3.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/caw3.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/caw3.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/chitter1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/chitter1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/chitter1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/chitter1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/dwoop.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/dwoop.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/dwoop.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/dwoop.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh3.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh3.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh3.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh3.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh4.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh4.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh4.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh4.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh5.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh5.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/ehh5.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ehh5.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/faucet.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/faucet.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/faucet.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/faucet.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/faucet2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/faucet2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/faucet2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/faucet2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/hoot.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/hoot.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/hoot.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/hoot.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/ribbit.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ribbit.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/ribbit.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/ribbit.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/tweet.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/tweet.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/tweet.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/tweet.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/uhm.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/uhm.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/uhm.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/uhm.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/kazooie/wurble1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/wurble1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/kazooie/wurble1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/kazooie/wurble1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/meow1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/meow1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/meow1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/meow1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/moth/mothchitter2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/moth/mothchitter2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/moth/mothchitter2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/moth/mothchitter2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/mothsqueak.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/mothsqueak.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/mothsqueak.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/mothsqueak.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_alphys.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_asgore.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_flowey_1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_flowey_2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_3.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_3.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_3.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_3.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_4.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_4.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_4.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_4.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_5.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_5.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_5.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_5.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_6.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_6.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_6.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_6.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_7.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_7.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_gaster_7.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_gaster_7.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_metta_1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_monster1.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_monster2.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_papyrus.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_ralsei.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_sans.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_sans.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_sans.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_sans.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_susie.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_susie.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_susie.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_susie.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_temmie.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_toriel.ogg
diff --git a/modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg b/modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg
similarity index 100%
rename from modular_zubbers/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg
rename to modular_zubbers/code/modules/blooper/voice/bloopers/undertale/voice_undyne.ogg
diff --git a/modular_zubbers/modules/borgs/code/robot_defense.dm b/modular_zubbers/code/modules/borgs/code/robot_defense.dm
similarity index 100%
rename from modular_zubbers/modules/borgs/code/robot_defense.dm
rename to modular_zubbers/code/modules/borgs/code/robot_defense.dm
diff --git a/modular_zubbers/code/modules/borgs/code/robot_defines.dm b/modular_zubbers/code/modules/borgs/code/robot_defines.dm
new file mode 100644
index 00000000000..9bef9411b07
--- /dev/null
+++ b/modular_zubbers/code/modules/borgs/code/robot_defines.dm
@@ -0,0 +1,101 @@
+// Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format
+
+#define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_cc.dmi'
+#define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_cc.dmi'
+
+#define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi'
+
+#define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_med.dmi'
+#define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_med.dmi'
+
+#define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_cargo.dmi'
+#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_cargo.dmi'
+
+#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_sec.dmi'
+#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_sec.dmi'
+
+#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_eng.dmi'
+#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_eng.dmi'
+
+#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_pk.dmi'
+#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/code/modules/borgs/sprites/tallrobot_pk.dmi'
+#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_pk.dmi'
+
+#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_serv.dmi'
+#define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_serv.dmi'
+
+#define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_mine.dmi'
+#define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_mine.dmi'
+
+#define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_jani.dmi'
+#define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_jani.dmi'
+
+#define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_syndie.dmi'
+#define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_syndie.dmi'
+
+#define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_ninja.dmi'
+#define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_ninja.dmi'
+
+#define CYBORG_ICON_TYPE_RAPTOR "raptor"
+
+#define CYBORG_ICON_SCI_WIDE 'modular_zubbers/code/modules/borgs/sprites/widerobot_sci.dmi'
+#define CYBORG_ICON_SCI_TALL 'modular_zubbers/code/modules/borgs/sprites/tallrobot_sci.dmi'
+#define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_sci.dmi'
+#define CYBORG_ICON_SCI 'modular_zubbers/code/modules/borgs/sprites/robot_sci.dmi'
+
+#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
+
+#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi'
+#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi'
+#define CYBORG_ICON_ENG_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi'
+#define CYBORG_ICON_MED_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_med.dmi'
+#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_car.dmi'
+#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi'
+#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi'
+#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi'
+#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_min.dmi'
+#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi'
+
+//F3-LINE cyborgs
+#define CYBORG_ICON_ALL_CATBORG 'modular_zubbers/code/modules/borgs/sprites/felibot_all.dmi'
+
+#define CYBORG_ICON_TYPE_GEN_CATBORG "FELI-Standard"
+#define CYBORG_ICON_TYPE_SCI_CATBORG "FELI-Research"
+#define CYBORG_ICON_TYPE_ENG_CATBORG "FELI-Engineer"
+#define CYBORG_ICON_TYPE_MED_CATBORG "FELI-Medical"
+#define CYBORG_ICON_TYPE_SERV_CATBORG "FELI-Service"
+#define CYBORG_ICON_TYPE_PK_CATBORG "FELI-Pk"
+#define CYBORG_ICON_TYPE_JANI_CATBORG "FELI-Janitor"
+#define CYBORG_ICON_TYPE_MINE_CATBORG "FELI-Mining"
+#define CYBORG_ICON_TYPE_SEC_CATBORG "FELI-Security"
+#define CYBORG_ICON_TYPE_SYNDI_CATBORG "FELI-Combat"
+#define CYBORG_ICON_TYPE_NINJA_CATBORG "FELI-Ninja"
+
+/mob/living/silicon/robot/model/centcom
+ icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER
+ icon_state = "valecc"
+ faction = list(ROLE_DEATHSQUAD)
+ req_access = list(ACCESS_CENT_GENERAL)
+ lawupdate = FALSE
+ scrambledcodes = TRUE // These are not station borgs.
+ ionpulse = TRUE
+ var/playstyle_string = "You are a Central Command cyborg!
"
+ set_model = /obj/item/robot_model/centcom
+ cell = /obj/item/stock_parts/cell/bluespace
+
+/mob/living/silicon/robot/model/centcom/Initialize(mapload)
+ laws = new /datum/ai_laws/central_override()
+ laws.associate(src)
+ . = ..()
+ addtimer(CALLBACK(src, PROC_REF(show_playstyle)), 0.5 SECONDS)
+
+/mob/living/silicon/robot/model/centcom/proc/show_playstyle()
+ if(playstyle_string)
+ to_chat(src, playstyle_string)
+
+/mob/living/silicon/robot/model/centcom/ResetModel()
+ return
+
+//Research cyborgs
+/mob/living/silicon/robot/model/sci
+ icon_state = "research"
diff --git a/modular_zubbers/modules/borgs/code/robot_items.dm b/modular_zubbers/code/modules/borgs/code/robot_items.dm
similarity index 100%
rename from modular_zubbers/modules/borgs/code/robot_items.dm
rename to modular_zubbers/code/modules/borgs/code/robot_items.dm
diff --git a/modular_zubbers/modules/borgs/code/robot_model.dm b/modular_zubbers/code/modules/borgs/code/robot_model.dm
similarity index 99%
rename from modular_zubbers/modules/borgs/code/robot_model.dm
rename to modular_zubbers/code/modules/borgs/code/robot_model.dm
index d6bd1b2aa20..1f57ceff2a5 100644
--- a/modular_zubbers/modules/borgs/code/robot_model.dm
+++ b/modular_zubbers/code/modules/borgs/code/robot_model.dm
@@ -98,7 +98,7 @@
cyborg_base_icon = "research"
cyborg_icon_override = CYBORG_ICON_SCI
model_select_icon = "research"
- model_select_alternate_icon = 'modular_zubbers/modules/borgs/sprites/screen_robot.dmi'
+ model_select_alternate_icon = 'modular_zubbers/code/modules/borgs/sprites/screen_robot.dmi'
model_traits = list(TRAIT_KNOW_ROBO_WIRES, TRAIT_RESEARCH_CYBORG)
hat_offset = 0
borg_skins = list(
diff --git a/modular_zubbers/modules/borgs/code/robot_upgrade.dm b/modular_zubbers/code/modules/borgs/code/robot_upgrade.dm
similarity index 100%
rename from modular_zubbers/modules/borgs/code/robot_upgrade.dm
rename to modular_zubbers/code/modules/borgs/code/robot_upgrade.dm
diff --git a/modular_zubbers/modules/borgs/sprites/felibot_all.dmi b/modular_zubbers/code/modules/borgs/sprites/felibot_all.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/felibot_all.dmi
rename to modular_zubbers/code/modules/borgs/sprites/felibot_all.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_cc.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_cc.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_cc.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_cc.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_eng.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_eng.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_jani.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_jani.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_jani.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_jani.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_med.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_med.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_med.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_med.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_mine.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_mine.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_mine.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_mine.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_pk.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_pk.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_sci.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_sci.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_sci.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_sci.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_sec.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_sec.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_serv.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_serv.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_serv.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_serv.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/largerobot_syndie.dmi b/modular_zubbers/code/modules/borgs/sprites/largerobot_syndie.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/largerobot_syndie.dmi
rename to modular_zubbers/code/modules/borgs/sprites/largerobot_syndie.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/robot_items.dmi b/modular_zubbers/code/modules/borgs/sprites/robot_items.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/robot_items.dmi
rename to modular_zubbers/code/modules/borgs/sprites/robot_items.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/robot_sci.dmi b/modular_zubbers/code/modules/borgs/sprites/robot_sci.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/robot_sci.dmi
rename to modular_zubbers/code/modules/borgs/sprites/robot_sci.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/screen_robot.dmi b/modular_zubbers/code/modules/borgs/sprites/screen_robot.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/screen_robot.dmi
rename to modular_zubbers/code/modules/borgs/sprites/screen_robot.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_car.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_car.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_car.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_car.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_med.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_med.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_med.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_med.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_min.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_min.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_min.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_min.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi b/modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi
rename to modular_zubbers/code/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi b/modular_zubbers/code/modules/borgs/sprites/tallrobot_pk.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi
rename to modular_zubbers/code/modules/borgs/sprites/tallrobot_pk.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/tallrobot_sci.dmi b/modular_zubbers/code/modules/borgs/sprites/tallrobot_sci.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/tallrobot_sci.dmi
rename to modular_zubbers/code/modules/borgs/sprites/tallrobot_sci.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/tallrobot_sec.dmi b/modular_zubbers/code/modules/borgs/sprites/tallrobot_sec.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/tallrobot_sec.dmi
rename to modular_zubbers/code/modules/borgs/sprites/tallrobot_sec.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_cc.dmi b/modular_zubbers/code/modules/borgs/sprites/widerobot_cc.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/widerobot_cc.dmi
rename to modular_zubbers/code/modules/borgs/sprites/widerobot_cc.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_clown.dmi b/modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/widerobot_clown.dmi
rename to modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_mine.dmi b/modular_zubbers/code/modules/borgs/sprites/widerobot_mine.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/widerobot_mine.dmi
rename to modular_zubbers/code/modules/borgs/sprites/widerobot_mine.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_sci.dmi b/modular_zubbers/code/modules/borgs/sprites/widerobot_sci.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/widerobot_sci.dmi
rename to modular_zubbers/code/modules/borgs/sprites/widerobot_sci.dmi
diff --git a/modular_zubbers/modules/borgs/sprites/widerobot_syndie.dmi b/modular_zubbers/code/modules/borgs/sprites/widerobot_syndie.dmi
similarity index 100%
rename from modular_zubbers/modules/borgs/sprites/widerobot_syndie.dmi
rename to modular_zubbers/code/modules/borgs/sprites/widerobot_syndie.dmi
diff --git a/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm b/modular_zubbers/code/modules/bubber_tram/code/moonstation_tram.dm
similarity index 90%
rename from modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm
rename to modular_zubbers/code/modules/bubber_tram/code/moonstation_tram.dm
index ec570dc317f..a367551c21d 100644
--- a/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm
+++ b/modular_zubbers/code/modules/bubber_tram/code/moonstation_tram.dm
@@ -25,11 +25,11 @@
obj_flags = parent_type::obj_flags | NO_DEBRIS_AFTER_DECONSTRUCTION
/obj/machinery/transport/destination_sign/moonstation
- icon = 'modular_zubbers/modules/bubber_tram/icons/tram_display.dmi'
+ icon = 'modular_zubbers/code/modules/bubber_tram/icons/tram_display.dmi'
configured_transport_id = MOONSTATION_LINE_1
/obj/machinery/transport/destination_sign/indicator/moonstation
- icon = 'modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi'
+ icon = 'modular_zubbers/code/modules/bubber_tram/icons/tram_indicator.dmi'
configured_transport_id = MOONSTATION_LINE_1
/obj/machinery/transport/destination_sign/Initialize(mapload)
@@ -39,7 +39,7 @@
/obj/machinery/computer/tram_controls/moonstation
name = "moon rover controls"
desc = "Unlike the iconic moon rover of yesteryears, our tram is here to remind you that even in space, mediocrity finds a way."
- icon = 'modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi'
+ icon = 'modular_zubbers/code/modules/bubber_tram/icons/tram_controls.dmi'
icon_screen = MOONSTATION_LINE_1
specific_transport_id = MOONSTATION_LINE_1
diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi b/modular_zubbers/code/modules/bubber_tram/icons/tram_controls.dmi
similarity index 100%
rename from modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi
rename to modular_zubbers/code/modules/bubber_tram/icons/tram_controls.dmi
diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi b/modular_zubbers/code/modules/bubber_tram/icons/tram_display.dmi
similarity index 100%
rename from modular_zubbers/modules/bubber_tram/icons/tram_display.dmi
rename to modular_zubbers/code/modules/bubber_tram/icons/tram_display.dmi
diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi b/modular_zubbers/code/modules/bubber_tram/icons/tram_indicator.dmi
similarity index 100%
rename from modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi
rename to modular_zubbers/code/modules/bubber_tram/icons/tram_indicator.dmi
diff --git a/modular_zubbers/modules/client/code/chat_color.dm b/modular_zubbers/code/modules/client/chat_color.dm
similarity index 100%
rename from modular_zubbers/modules/client/code/chat_color.dm
rename to modular_zubbers/code/modules/client/chat_color.dm
diff --git a/modular_zubbers/modules/examine/examine_tgui.dm b/modular_zubbers/code/modules/client/examine_tgui.dm
similarity index 100%
rename from modular_zubbers/modules/examine/examine_tgui.dm
rename to modular_zubbers/code/modules/client/examine_tgui.dm
diff --git a/modular_zubbers/modules/client/flavor_text/flavor_text.dm b/modular_zubbers/code/modules/client/flavor_text/flavor_text.dm
similarity index 100%
rename from modular_zubbers/modules/client/flavor_text/flavor_text.dm
rename to modular_zubbers/code/modules/client/flavor_text/flavor_text.dm
diff --git a/modular_zubbers/modules/client/code/preferences.dm b/modular_zubbers/code/modules/client/preferences/preferences.dm
similarity index 100%
rename from modular_zubbers/modules/client/code/preferences.dm
rename to modular_zubbers/code/modules/client/preferences/preferences.dm
diff --git a/modular_zubbers/modules/client/code/ssd.dm b/modular_zubbers/code/modules/client/ssd.dm
similarity index 100%
rename from modular_zubbers/modules/client/code/ssd.dm
rename to modular_zubbers/code/modules/client/ssd.dm
diff --git a/modular_zubbers/code/modules/customization/modules/jobs/_job.dm b/modular_zubbers/code/modules/clothing/_job.dm
similarity index 100%
rename from modular_zubbers/code/modules/customization/modules/jobs/_job.dm
rename to modular_zubbers/code/modules/clothing/_job.dm
diff --git a/modular_zubbers/modules/clothing/armor_overrides/hos_armor.dm b/modular_zubbers/code/modules/clothing/armor_overrides/hos_armor.dm
similarity index 100%
rename from modular_zubbers/modules/clothing/armor_overrides/hos_armor.dm
rename to modular_zubbers/code/modules/clothing/armor_overrides/hos_armor.dm
diff --git a/modular_zubbers/modules/modular_items/code/idmaco_donator.dm b/modular_zubbers/code/modules/clothing/donator_clothing.dm
similarity index 71%
rename from modular_zubbers/modules/modular_items/code/idmaco_donator.dm
rename to modular_zubbers/code/modules/clothing/donator_clothing.dm
index af4bbdf48c4..16fd9dba332 100644
--- a/modular_zubbers/modules/modular_items/code/idmaco_donator.dm
+++ b/modular_zubbers/code/modules/clothing/donator_clothing.dm
@@ -1,58 +1,60 @@
+/obj/item/clothing/suit/toggle/labcoat/vic_dresscoat_donator // modified on request of nikotheguydude, the person who donated for this upstream
+ name = "elaborate dresscoat"
+ special_desc = "On a closer inspection, it would appear the interior is modified with protective material and mounting points \
+ most often found on medical labcoats."
+
//@EspeciallyStrange @Wolf751 for the sprite if reaching out to us is needed
// Sprites are donated from either project kepler or hand done by me for this occasion, They can be used for anything else
//Will also be available for usage in Foundation 19
// Placed in these file so that You and others may remove them if I am not playing here anymore, or if it were to be used for anything else!
-#define IDMA_CKEY_WHITELIST list("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
-#define IDMA_RESTRICTED_ROLE list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
-
/datum/loadout_item/suit/idmavest
name = "IDMA combat vest"
item_path = /obj/item/clothing/suit/armor/vest/idma_vest
- ckeywhitelist = IDMA_CKEY_WHITELIST
- restricted_roles = IDMA_RESTRICTED_ROLE
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
+ restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
/datum/loadout_item/suit/idmarsuit
name = "IDMA service jacket"
item_path = /obj/item/clothing/suit/hooded/wintercoat/security/idma_jacket
- ckeywhitelist = IDMA_CKEY_WHITELIST
- restricted_roles = IDMA_RESTRICTED_ROLE
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
+ restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
/datum/loadout_item/suit/idmardjacket
name = "silicon administrator vest"
item_path = /obj/item/clothing/suit/jacket/vera_jacket
- ckeywhitelist = IDMA_CKEY_WHITELIST
- restricted_roles = list(JOB_RESEARCH_DIRECTOR) // and otherwise if not, specific to the RD
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
+ restricted_roles = list (JOB_RESEARCH_DIRECTOR) // and otherwise if not, specific to the RD
/datum/loadout_item/under/miscellaneous/idmasnowfatigue
name = "IDMA service uniform"
item_path = /obj/item/clothing/under/rank/security/idma_fatigue
- ckeywhitelist = IDMA_CKEY_WHITELIST
- restricted_roles = IDMA_RESTRICTED_ROLE
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
+ restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
/datum/loadout_item/under/miscellaneous/idmafatigue
name = "IDMA desert service uniform"
item_path = /obj/item/clothing/under/rank/security/idma_fatigue/alt
- ckeywhitelist = IDMA_CKEY_WHITELIST
- restricted_roles = IDMA_RESTRICTED_ROLE
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
+ restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
/datum/loadout_item/head/idmaberet
name = "IDMA beret"
item_path = /obj/item/clothing/head/idma_beret
- ckeywhitelist = IDMA_CKEY_WHITELIST
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
/datum/loadout_item/head/idmahelmet
name = "IDMA service helmet"
item_path = /obj/item/clothing/head/helmet/sec/sol/idma_helmet
- ckeywhitelist = IDMA_CKEY_WHITELIST
- restricted_roles = IDMA_RESTRICTED_ROLE
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
+ restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
/datum/loadout_item/accessory/idmaarmbands
name = "IDMA armbands"
item_path = /obj/item/clothing/accessory/armband/idmaarmband
- ckeywhitelist = IDMA_CKEY_WHITELIST
+ ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
/datum/loadout_item/toys/especiallystrange
name = "Ironmoon Tajaran Plushie"
@@ -97,7 +99,7 @@
icon = 'modular_zubbers/icons/donator/idmaco.dmi'
worn_icon = 'modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi'
armor_type = /datum/armor/skyrat_rd // It's a really advanced labcoat at the end of the day
- allowed = list(
+ allowed = list (
/obj/item/biopsy_tool,
/obj/item/dnainjector,
/obj/item/flashlight/pen,
@@ -167,10 +169,8 @@
desc = "A small plushie based on the thousand tajaran volunteer, this one in particular seems to be a gun maintainer."
icon_state = "travian"
icon = 'modular_zubbers/icons/donator/idmaco.dmi'
- attack_verb_continuous = list("cuddles", "meows", "hisses")
- attack_verb_simple = list("cuddle", "meow", "hiss")
- squeak_override = list('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1)
+ attack_verb_continuous = list ("cuddles", "meows", "hisses")
+ attack_verb_simple = list ("cuddle", "meow", "hiss")
+ squeak_override = list ('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1)
resistance_flags = FIRE_PROOF
-#undef IDMA_CKEY_WHITELIST
-#undef IDMA_RESTRICTED_ROLE
diff --git a/modular_zubbers/modules/clothing/code/gloves/clown.dm b/modular_zubbers/code/modules/clothing/gloves/clown.dm
similarity index 100%
rename from modular_zubbers/modules/clothing/code/gloves/clown.dm
rename to modular_zubbers/code/modules/clothing/gloves/clown.dm
diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm
index dfd766e89ef..ba654bece9d 100644
--- a/modular_zubbers/code/modules/clothing/head/helmet.dm
+++ b/modular_zubbers/code/modules/clothing/head/helmet.dm
@@ -15,3 +15,50 @@
inhand_icon_state = null
armor_type = /datum/armor/none
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+
+/obj/item/clothing/head/helmet/toggleable/pinwheel //sprites by Keila
+ name = "pinwheel hat"
+ desc = "Space Jesus gives his silliest hats to his most whimsical of goobers."
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "pinwheel"
+ inhand_icon_state = null
+ lefthand_file = null
+ righthand_file = null
+ armor_type = /datum/armor/none
+ clothing_flags = null
+ flags_cover = null
+ flags_inv = null
+ toggle_message = "You stop the spinner on"
+ alt_toggle_message = "You spin the spinner on"
+ actions_types = list(/datum/action/item_action/toggle_helmet_light)
+ ///Cooldown for toggling the spinner.
+ COOLDOWN_DECLARE(pinwheel_toggle_cooldown)
+
+/obj/item/clothing/head/helmet/toggleable/pinwheel/adjust_visor()
+ if(!COOLDOWN_FINISHED(src, pinwheel_toggle_cooldown))
+ return FALSE
+ COOLDOWN_START(src, pinwheel_toggle_cooldown, 1 SECONDS)
+ return TRUE
+
+/obj/item/clothing/head/helmet/toggleable/pinwheel/gold
+ name = "magnificent pinwheel hat"
+ desc = "The strongest possible pinwheel pinwheel hat. Such is fate that the silliest things in the world are also the most beautiful; others may not see the shine in you, but the magnificent pinwheel hat does. It appreciates you for who you are and what you've done. It feels alive, and makes you feel alive too. You see the totality of existence reflected in the golden shimmer of the pin." //Does literally nothing more than the regular pinwheel hat. Just for emphasis.
+ icon_state = "pinwheel_gold"
+
+
+//Clussy and Jester sprites from Splurt.
+/obj/item/clothing/head/costume/bubber/jester
+ name = "amazing jester hat"
+ desc = "It's my money, it's my game, Kill Jester."
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "striped_jester_hat"
+
+/obj/item/clothing/head/costume/bubber/clussy
+ name = "pink clown wig"
+ desc = "Did you know that the first Wig was made for John William Whig, founder of the Whig Party? They only allowed bald men until the year 1972, when the party became unpopular."
+ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
+ icon_state = "clussy_wig"
+ flags_inv = HIDEHAIR
diff --git a/modular_zubbers/modules/clothing/code/mask/clown.dm b/modular_zubbers/code/modules/clothing/mask/clown.dm
similarity index 68%
rename from modular_zubbers/modules/clothing/code/mask/clown.dm
rename to modular_zubbers/code/modules/clothing/mask/clown.dm
index 72ea23ccc53..50ae7d8e37d 100644
--- a/modular_zubbers/modules/clothing/code/mask/clown.dm
+++ b/modular_zubbers/code/modules/clothing/mask/clown.dm
@@ -31,3 +31,16 @@
. = ..()
user.update_worn_mask()
voice_filter = null // performer masks expect to be talked through
+
+
+/obj/item/clothing/mask/gas/sechailer/half_mask
+ name = "tacticool neck gaiter"
+ desc = "A black techwear mask. Its low-profile design contrasts with the edge. Has a small respirator to be used with internals."
+ actions_types = list(/datum/action/item_action/adjust)
+ alternate_worn_layer = BODY_FRONT_UNDER_CLOTHES
+ icon_state = "half_mask"
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/masks.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/mask.dmi'
+ unique_death = 'modular_skyrat/master_files/sound/effects/hacked.ogg'
+ voice_filter = null
+ use_radio_beeps_tts = FALSE
diff --git a/modular_zubbers/modules/clothing/code/feet/clown.dm b/modular_zubbers/code/modules/clothing/shoes/clown.dm
similarity index 100%
rename from modular_zubbers/modules/clothing/code/feet/clown.dm
rename to modular_zubbers/code/modules/clothing/shoes/clown.dm
diff --git a/modular_zubbers/modules/clothing/code/uniform/clown.dm b/modular_zubbers/code/modules/clothing/under/clown.dm
similarity index 100%
rename from modular_zubbers/modules/clothing/code/uniform/clown.dm
rename to modular_zubbers/code/modules/clothing/under/clown.dm
diff --git a/modular_zubbers/code/modules/customization/modules/clothing/under/security.dm b/modular_zubbers/code/modules/clothing/under/security.dm
similarity index 100%
rename from modular_zubbers/code/modules/customization/modules/clothing/under/security.dm
rename to modular_zubbers/code/modules/clothing/under/security.dm
diff --git a/modular_zubbers/code/modules/clothing/under/syndicate.dm b/modular_zubbers/code/modules/clothing/under/syndicate.dm
index 53902ca28f6..9cd539aec71 100644
--- a/modular_zubbers/code/modules/clothing/under/syndicate.dm
+++ b/modular_zubbers/code/modules/clothing/under/syndicate.dm
@@ -22,3 +22,19 @@
icon_state = "syndimaid_corset"
minimize_when_attached = FALSE
attachment_slot = null
+
+/obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured
+ name = "utility overalls turtleneck"
+ desc = "A pair of spiffy overalls with a turtleneck underneath, useful for both engineering and botanical work."
+ icon_state = "syndicate_overalls"
+ armor_type = /datum/armor/clothing_under/none
+ has_sensor = HAS_SENSORS
+ can_adjust = TRUE
+
+/obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured/skirt
+ name = "utility overalls skirtleneck"
+ desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy."
+ icon_state = "syndicate_overallskirt"
+ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
diff --git a/modular_zubbers/code/modules/clothing/undershirt.dm b/modular_zubbers/code/modules/clothing/undershirt.dm
index fd72c16be70..28d9e4ec800 100644
--- a/modular_zubbers/code/modules/clothing/undershirt.dm
+++ b/modular_zubbers/code/modules/clothing/undershirt.dm
@@ -3,3 +3,17 @@
icon = 'modular_zubbers/icons/mob/clothing/underwear.dmi'
icon_state = "shirt_dogborg"
use_static = null
+
+/datum/sprite_accessory/bra/cowprint
+ name = "Bra - Cowprint"
+ icon = 'modular_zubbers/master_files/icons/mob/sprite_accessory/clothing.dmi'
+ icon_state = "bra_cowprint"
+ gender = FEMALE
+ use_static = TRUE
+
+/datum/sprite_accessory/underwear/cowprint
+ name = "Panties - Cowprint"
+ icon = 'modular_zubbers/master_files/icons/mob/sprite_accessory/clothing.dmi'
+ icon_state = "underwear_cowprint"
+ gender = FEMALE
+ use_static = TRUE
diff --git a/modular_zubbers/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/tools.dm b/modular_zubbers/code/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/tools.dm
similarity index 100%
rename from modular_zubbers/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/tools.dm
rename to modular_zubbers/code/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/tools.dm
diff --git a/modular_zubbers/code/modules/designs/limbgrower_designs.dm b/modular_zubbers/code/modules/designs/limbgrower_designs.dm
index ee3cf34690a..e324d774319 100644
--- a/modular_zubbers/code/modules/designs/limbgrower_designs.dm
+++ b/modular_zubbers/code/modules/designs/limbgrower_designs.dm
@@ -74,3 +74,10 @@
/obj/item/disk/design_disk/limbs/tajaran
name = "Tajaran Organ Design Disk"
limb_designs = list(/obj/item/organ/internal/tongue/cat/tajaran, /obj/item/organ/internal/eyes/tajaran, /obj/item/organ/internal/ears/cat/tajaran)
+
+/obj/machinery/limbgrower/Initialize(mapload)
+ categories += list(
+ SPECIES_HEMOPHAGE,
+ SPECIES_TAJARAN
+ )
+ . = ..()
diff --git a/modular_zubbers/modules/emotes/code/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm
similarity index 74%
rename from modular_zubbers/modules/emotes/code/emotes.dm
rename to modular_zubbers/code/modules/emotes/emotes.dm
index 3c802d19498..796129e2dd4 100644
--- a/modular_zubbers/modules/emotes/code/emotes.dm
+++ b/modular_zubbers/code/modules/emotes/emotes.dm
@@ -6,7 +6,7 @@
message = "chirps!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/chirp.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg'
/datum/emote/living/caw
key = "caw"
@@ -14,7 +14,7 @@
message = "caws!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/caw.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/caw.ogg'
/datum/emote/living/caw2
key = "caw2"
@@ -22,7 +22,7 @@
message = "caws twice!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/caw2.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/caw2.ogg'
/datum/emote/living/mrrp //you play like a cat
key = "mrrp"
@@ -30,7 +30,7 @@
message = "mrrps!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/mrrp.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/mrrp.ogg'
/datum/emote/living/fpurr
key = "fpurr"
@@ -38,7 +38,7 @@
message = "purrs!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/fox_purr.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/fox_purr.ogg'
/datum/emote/living/prbt //all tesh players will love me
key = "prbt"
@@ -46,7 +46,7 @@
message = "prbts!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/prbt.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/prbt.ogg'
/datum/emote/living/gecker
key = "gecker"
@@ -54,7 +54,7 @@
message = "geckers!"
emote_type = EMOTE_AUDIBLE
vary = TRUE
- sound = 'modular_zubbers/modules/emotes/sound/voice/foxgecker.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/voice/foxgecker.ogg'
/datum/emote/living/mar //all shadekin players will love me
key = "mar"
diff --git a/modular_zubbers/modules/emotes/sound/synth_voice/synth_error.ogg b/modular_zubbers/code/modules/emotes/sound/synth_voice/synth_error.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/synth_voice/synth_error.ogg
rename to modular_zubbers/code/modules/emotes/sound/synth_voice/synth_error.ogg
diff --git a/modular_zubbers/modules/emotes/sound/synth_voice/synth_scary.ogg b/modular_zubbers/code/modules/emotes/sound/synth_voice/synth_scary.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/synth_voice/synth_scary.ogg
rename to modular_zubbers/code/modules/emotes/sound/synth_voice/synth_scary.ogg
diff --git a/modular_zubbers/modules/emotes/sound/synth_voice/synth_shutdown.ogg b/modular_zubbers/code/modules/emotes/sound/synth_voice/synth_shutdown.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/synth_voice/synth_shutdown.ogg
rename to modular_zubbers/code/modules/emotes/sound/synth_voice/synth_shutdown.ogg
diff --git a/modular_zubbers/modules/emotes/sound/synth_voice/synth_startup.ogg b/modular_zubbers/code/modules/emotes/sound/synth_voice/synth_startup.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/synth_voice/synth_startup.ogg
rename to modular_zubbers/code/modules/emotes/sound/synth_voice/synth_startup.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/caw.ogg b/modular_zubbers/code/modules/emotes/sound/voice/caw.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/caw.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/caw.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/caw2.ogg b/modular_zubbers/code/modules/emotes/sound/voice/caw2.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/caw2.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/caw2.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/chirp.ogg b/modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/chirp.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/fox_purr.ogg b/modular_zubbers/code/modules/emotes/sound/voice/fox_purr.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/fox_purr.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/fox_purr.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/foxgecker.ogg b/modular_zubbers/code/modules/emotes/sound/voice/foxgecker.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/foxgecker.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/foxgecker.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/mrrp.ogg b/modular_zubbers/code/modules/emotes/sound/voice/mrrp.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/mrrp.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/mrrp.ogg
diff --git a/modular_zubbers/modules/emotes/sound/voice/prbt.ogg b/modular_zubbers/code/modules/emotes/sound/voice/prbt.ogg
similarity index 100%
rename from modular_zubbers/modules/emotes/sound/voice/prbt.ogg
rename to modular_zubbers/code/modules/emotes/sound/voice/prbt.ogg
diff --git a/modular_zubbers/modules/emotes/code/synth_emotes.dm b/modular_zubbers/code/modules/emotes/synth_emotes.dm
similarity index 68%
rename from modular_zubbers/modules/emotes/code/synth_emotes.dm
rename to modular_zubbers/code/modules/emotes/synth_emotes.dm
index fd7750f4d97..7dbb6a14518 100644
--- a/modular_zubbers/modules/emotes/code/synth_emotes.dm
+++ b/modular_zubbers/code/modules/emotes/synth_emotes.dm
@@ -2,7 +2,7 @@
key = "scary"
message = "emits a disconcerting tone."
vary = FALSE
- sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_scary.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/synth_voice/synth_scary.ogg'
allowed_species = list(/datum/species/synthetic)
cooldown = 2 SECONDS
@@ -10,7 +10,7 @@
key = "error"
message = "experiences a system error."
vary = FALSE
- sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_error.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/synth_voice/synth_error.ogg'
allowed_species = list(/datum/species/synthetic)
cooldown = 2 SECONDS
@@ -18,7 +18,7 @@
key = "startup"
message = "chimes to life."
vary = FALSE
- sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_startup.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/synth_voice/synth_startup.ogg'
allowed_species = list(/datum/species/synthetic)
cooldown = 2 SECONDS
@@ -26,6 +26,6 @@
key = "shutdown"
message = "emits a nostalgic tone as they fall silent."
vary = FALSE
- sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_shutdown.ogg'
+ sound = 'modular_zubbers/code/modules/emotes/sound/synth_voice/synth_shutdown.ogg'
allowed_species = list(/datum/species/synthetic)
cooldown = 2 SECONDS
diff --git a/modular_zubbers/modules/ert_overrides/modified_equipement.dm b/modular_zubbers/code/modules/ert_overrides/modified_equipement.dm
similarity index 100%
rename from modular_zubbers/modules/ert_overrides/modified_equipement.dm
rename to modular_zubbers/code/modules/ert_overrides/modified_equipement.dm
diff --git a/modular_zubbers/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_zubbers/code/modules/gladiator/code/game/objects/items/gladiator_items.dm
similarity index 100%
rename from modular_zubbers/modules/gladiator/code/game/objects/items/gladiator_items.dm
rename to modular_zubbers/code/modules/gladiator/code/game/objects/items/gladiator_items.dm
diff --git a/modular_zubbers/modules/hacks/atmos/force_atmos.dm b/modular_zubbers/code/modules/hacks/atmos/force_atmos.dm
similarity index 100%
rename from modular_zubbers/modules/hacks/atmos/force_atmos.dm
rename to modular_zubbers/code/modules/hacks/atmos/force_atmos.dm
diff --git a/modular_zubbers/modules/hydroponics/code/grown/rocks.dm b/modular_zubbers/code/modules/hydroponics/code/grown/rocks.dm
similarity index 88%
rename from modular_zubbers/modules/hydroponics/code/grown/rocks.dm
rename to modular_zubbers/code/modules/hydroponics/code/grown/rocks.dm
index bb993ad1a19..240ad965b18 100644
--- a/modular_zubbers/modules/hydroponics/code/grown/rocks.dm
+++ b/modular_zubbers/code/modules/hydroponics/code/grown/rocks.dm
@@ -3,7 +3,7 @@
desc = "Small seedlings of the golem rockfruit plant. There's a warning label on its packaging: \n\
\"Remember: Legally speaking, rocking is more legal than stoning. \n \
We are not liable for any injury, death, or complete body evaporation caused by using or growing these plants\""
- icon = 'modular_zubbers/modules/hydroponics/icons/seeds.dmi'
+ icon = 'modular_zubbers/code/modules/hydroponics/icons/seeds.dmi'
icon_state = "seed-rockfruit"
species = "rock"
plantname = "Rockfruits"
@@ -20,7 +20,7 @@
growthstages = 2
- growing_icon = 'modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi'
+ growing_icon = 'modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy,
/datum/plant_gene/trait/fire_resistance,
@@ -40,7 +40,7 @@
force = 5 // Comparatively shit considering a nettle is 15
throwforce = 10 // Less shit but hey, it is a rock
- icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
+ icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
icon_state = "rockfruit"
var/product = /obj/item/food/grown/rockfruit
@@ -71,7 +71,7 @@
foodtypes = FRUIT
- icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
+ icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
icon_state = "rockfruit-peeled"
tastes = list("mountains" = 1)
@@ -81,7 +81,7 @@
desc = "The peeled shell of a rockfruit, or as you may call it, \"Literal pile of rocks\". \
Probably not edible, but a golem will try to prove you otherwise"
- icon = 'modular_zubbers/modules/hydroponics/icons/harvest.dmi'
+ icon = 'modular_zubbers/code/modules/hydroponics/icons/harvest.dmi'
icon_state = "rockfruit-trash"
foodtypes = STONE
diff --git a/modular_zubbers/modules/hydroponics/code/plantgenes/hydroponics.dm b/modular_zubbers/code/modules/hydroponics/code/plantgenes/hydroponics.dm
similarity index 100%
rename from modular_zubbers/modules/hydroponics/code/plantgenes/hydroponics.dm
rename to modular_zubbers/code/modules/hydroponics/code/plantgenes/hydroponics.dm
diff --git a/modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi b/modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi
similarity index 100%
rename from modular_zubbers/modules/hydroponics/icons/growing_fruits.dmi
rename to modular_zubbers/code/modules/hydroponics/icons/growing_fruits.dmi
diff --git a/modular_zubbers/modules/hydroponics/icons/harvest.dmi b/modular_zubbers/code/modules/hydroponics/icons/harvest.dmi
similarity index 100%
rename from modular_zubbers/modules/hydroponics/icons/harvest.dmi
rename to modular_zubbers/code/modules/hydroponics/icons/harvest.dmi
diff --git a/modular_zubbers/modules/hydroponics/icons/seeds.dmi b/modular_zubbers/code/modules/hydroponics/icons/seeds.dmi
similarity index 100%
rename from modular_zubbers/modules/hydroponics/icons/seeds.dmi
rename to modular_zubbers/code/modules/hydroponics/icons/seeds.dmi
diff --git a/modular_zubbers/modules/hydroponics/readme.txt b/modular_zubbers/code/modules/hydroponics/readme.txt
similarity index 100%
rename from modular_zubbers/modules/hydroponics/readme.txt
rename to modular_zubbers/code/modules/hydroponics/readme.txt
diff --git a/modular_zubbers/modules/job_exempt/job_exempt.dm b/modular_zubbers/code/modules/job_exempt/job_exempt.dm
similarity index 100%
rename from modular_zubbers/modules/job_exempt/job_exempt.dm
rename to modular_zubbers/code/modules/job_exempt/job_exempt.dm
diff --git a/modular_zubbers/code/modules/jobs/job_types/quartermaster.dm b/modular_zubbers/code/modules/jobs/job_types/quartermaster.dm
new file mode 100644
index 00000000000..dfb5bcf918e
--- /dev/null
+++ b/modular_zubbers/code/modules/jobs/job_types/quartermaster.dm
@@ -0,0 +1,2 @@
+/datum/outfit/job/quartermaster //to-do: upstream this to skyrat
+ glasses = /obj/item/clothing/glasses/hud/gun_permit/sunglasses
diff --git a/modular_zubbers/modules/jobs/code/job_types/warden.dm b/modular_zubbers/code/modules/jobs/job_types/warden.dm
similarity index 100%
rename from modular_zubbers/modules/jobs/code/job_types/warden.dm
rename to modular_zubbers/code/modules/jobs/job_types/warden.dm
diff --git a/modular_zubbers/modules/jobs/code/trims/jobs.dm b/modular_zubbers/code/modules/jobs/trims/jobs.dm
similarity index 100%
rename from modular_zubbers/modules/jobs/code/trims/jobs.dm
rename to modular_zubbers/code/modules/jobs/trims/jobs.dm
diff --git a/modular_zubbers/modules/customization/modules/language/_language_holder.dm b/modular_zubbers/code/modules/languages/_language_holder.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/language/_language_holder.dm
rename to modular_zubbers/code/modules/languages/_language_holder.dm
diff --git a/modular_zubbers/modules/customization/modules/language/common.dm b/modular_zubbers/code/modules/languages/common.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/language/common.dm
rename to modular_zubbers/code/modules/languages/common.dm
diff --git a/modular_zubbers/modules/customization/modules/language/nekomimetic.dm b/modular_zubbers/code/modules/languages/nekomimetic.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/language/nekomimetic.dm
rename to modular_zubbers/code/modules/languages/nekomimetic.dm
diff --git a/modular_zubbers/modules/customization/modules/language/panslavic.dm b/modular_zubbers/code/modules/languages/panslavic.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/language/panslavic.dm
rename to modular_zubbers/code/modules/languages/panslavic.dm
diff --git a/modular_zubbers/modules/customization/modules/language/piratespeak.dm b/modular_zubbers/code/modules/languages/piratespeak.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/language/piratespeak.dm
rename to modular_zubbers/code/modules/languages/piratespeak.dm
diff --git a/modular_zubbers/modules/customization/modules/language/siikmaas.dm b/modular_zubbers/code/modules/languages/siikmaas.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/language/siikmaas.dm
rename to modular_zubbers/code/modules/languages/siikmaas.dm
diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_masks.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_masks.dm
new file mode 100644
index 00000000000..4367fd1f640
--- /dev/null
+++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_masks.dm
@@ -0,0 +1,3 @@
+/datum/loadout_item/mask/sechailer_half_mask
+ name = "Tacticool Half-Mask"
+ item_path = /obj/item/clothing/mask/gas/sechailer/half_mask
diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm
index 230e80f4de8..4f9f89056d3 100644
--- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm
+++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm
@@ -47,7 +47,15 @@
name = "Black Divers Uniform"
item_path = /obj/item/clothing/under/misc/diver
ckeywhitelist = list("sexmaster", "leafydasurvivor")
+
/datum/loadout_item/under/miscellaneous/dress_strapped
name = "Formal Evening Gown"
item_path = /obj/item/clothing/under/dress/bubber/strapped
+/datum/loadout_item/under/miscellaneous/syndicate_skyrat_overalls_unarmoured
+ name = "Tacticool Utility Overalls"
+ item_path = /obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured
+
+/datum/loadout_item/under/miscellaneous/syndicate_skyrat_overalls_unarmoured_skirt
+ name = "Tacticool Utility Skirt and Suspenders"
+ item_path = /obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured/skirt
diff --git a/modular_zubbers/modules/lunchbox/code/lunchbox.dm b/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm
similarity index 86%
rename from modular_zubbers/modules/lunchbox/code/lunchbox.dm
rename to modular_zubbers/code/modules/lunchbox/code/lunchbox.dm
index 87ffe49b9c9..248dea523c4 100644
--- a/modular_zubbers/modules/lunchbox/code/lunchbox.dm
+++ b/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm
@@ -1,11 +1,11 @@
/obj/item/storage/lunchbox
name = "lunchbox"
- icon = 'modular_zubbers/modules/lunchbox/icons/lunchbox.dmi'
+ icon = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox.dmi'
icon_state = "lunchbox"
desc = "It's fucked, yell at coders."
inhand_icon_state = "lunchbox"
- lefthand_file = 'modular_zubbers/modules/lunchbox/icons/lunchbox_lefthand.dmi'
- righthand_file = 'modular_zubbers/modules/lunchbox/icons/lunchbox_righthand.dmi'
+ lefthand_file = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox_lefthand.dmi'
+ righthand_file = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox_righthand.dmi'
drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
throw_speed = 3
diff --git a/modular_zubbers/modules/lunchbox/icons/lunchbox.dmi b/modular_zubbers/code/modules/lunchbox/icons/lunchbox.dmi
similarity index 100%
rename from modular_zubbers/modules/lunchbox/icons/lunchbox.dmi
rename to modular_zubbers/code/modules/lunchbox/icons/lunchbox.dmi
diff --git a/modular_zubbers/modules/lunchbox/icons/lunchbox_lefthand.dmi b/modular_zubbers/code/modules/lunchbox/icons/lunchbox_lefthand.dmi
similarity index 100%
rename from modular_zubbers/modules/lunchbox/icons/lunchbox_lefthand.dmi
rename to modular_zubbers/code/modules/lunchbox/icons/lunchbox_lefthand.dmi
diff --git a/modular_zubbers/modules/lunchbox/icons/lunchbox_righthand.dmi b/modular_zubbers/code/modules/lunchbox/icons/lunchbox_righthand.dmi
similarity index 100%
rename from modular_zubbers/modules/lunchbox/icons/lunchbox_righthand.dmi
rename to modular_zubbers/code/modules/lunchbox/icons/lunchbox_righthand.dmi
diff --git a/modular_zubbers/modules/mapping/modules/ss13_construct/areas.dm b/modular_zubbers/code/modules/mapping/ss13_construct/areas.dm
similarity index 100%
rename from modular_zubbers/modules/mapping/modules/ss13_construct/areas.dm
rename to modular_zubbers/code/modules/mapping/ss13_construct/areas.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/fluff.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm
rename to modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/fluff.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm
rename to modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
similarity index 79%
rename from modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm
rename to modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
index df52ce94096..c3edcf96936 100644
--- a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm
+++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/horns.dm
@@ -1,6 +1,6 @@
/datum/sprite_accessory/horns/sylveon
name = "Sylveon Bow"
- icon = 'modular_zubbers/modules/customization/icons/mutant_bodyparts.dmi'
+ icon = 'modular_zubbers/icons/customization/mutant_bodyparts.dmi'
icon_state = "sylveon_bow" // SPRITE CREDIT - https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/pull/375
color_src = USE_MATRIXED_COLORS
relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm
rename to modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm
rename to modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
similarity index 83%
rename from modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm
rename to modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index 7330d9fd408..0d2fb8db78d 100644
--- a/modular_zubbers/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -1,6 +1,6 @@
/datum/sprite_accessory/wings/mammal/sylveon
name = "Sylveon ribbons"
- icon = 'modular_zubbers/modules/customization/icons/wings.dmi'
+ icon = 'modular_zubbers/icons/customization/wings.dmi'
icon_state = "sylveon_bow" // SPRITE CREDIT - https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/pull/375
color_src = USE_MATRIXED_COLORS
relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER)
diff --git a/modular_zubbers/modules/customization/modules/mob/dead/taur_types.dm b/modular_zubbers/code/modules/mob/dead/taur_types.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/dead/taur_types.dm
rename to modular_zubbers/code/modules/mob/dead/taur_types.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/living/carbon/human/species/akula.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/akula.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/living/carbon/human/species/akula.dm
rename to modular_zubbers/code/modules/mob/living/carbon/human/species/akula.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm
rename to modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm
diff --git a/modular_zubbers/modules/customization/modules/mob/living/carbon/human/species/xeno.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/xeno.dm
similarity index 100%
rename from modular_zubbers/modules/customization/modules/mob/living/carbon/human/species/xeno.dm
rename to modular_zubbers/code/modules/mob/living/carbon/human/species/xeno.dm
diff --git a/modular_zubbers/modules/mod_suits/modules.dm b/modular_zubbers/code/modules/mod/modules.dm
similarity index 100%
rename from modular_zubbers/modules/mod_suits/modules.dm
rename to modular_zubbers/code/modules/mod/modules.dm
diff --git a/modular_zubbers/modules/modular_items/code/cake_light.dm b/modular_zubbers/code/modules/modular_items/code/cake_light.dm
similarity index 100%
rename from modular_zubbers/modules/modular_items/code/cake_light.dm
rename to modular_zubbers/code/modules/modular_items/code/cake_light.dm
diff --git a/modular_zubbers/modules/modular_items/code/food_and_drinks/food/meatslab.dm b/modular_zubbers/code/modules/modular_items/code/food_and_drinks/food/meatslab.dm
similarity index 100%
rename from modular_zubbers/modules/modular_items/code/food_and_drinks/food/meatslab.dm
rename to modular_zubbers/code/modules/modular_items/code/food_and_drinks/food/meatslab.dm
diff --git a/modular_zubbers/modules/modular_items/code/necklace.dm b/modular_zubbers/code/modules/modular_items/code/necklace.dm
similarity index 100%
rename from modular_zubbers/modules/modular_items/code/necklace.dm
rename to modular_zubbers/code/modules/modular_items/code/necklace.dm
diff --git a/modular_zubbers/modules/modular_items/code/recipes_misc.dm b/modular_zubbers/code/modules/modular_items/code/recipes_misc.dm
similarity index 100%
rename from modular_zubbers/modules/modular_items/code/recipes_misc.dm
rename to modular_zubbers/code/modules/modular_items/code/recipes_misc.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/carwo.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/carwo.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/carwo.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/carwo.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/ammobox.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/ammobox.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/ammobox.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/ammobox.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/carwo.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/carwo.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/carwo.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/carwo.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm
similarity index 95%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm
index 00d7526b4a0..e373bef22f0 100644
--- a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm
+++ b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm
@@ -15,12 +15,12 @@
Seen commonly amongst the Marsians who produce the weapon, with many different shapes and sizes to fit \
the wide variety of modders the planet is home to."
base_icon_state = "hyeseong"
- icon = 'modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi'
+ icon = 'modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi'
icon_state = "hyeseong_kill"
- lefthand_file = 'modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi'
- righthand_file = 'modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi'
+ lefthand_file = 'modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi'
+ righthand_file = 'modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi'
inhand_icon_state = "hyeseong_kill"
- worn_icon = 'modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi'
+ worn_icon = 'modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi'
worn_icon_state = "hyeseong_kill"
cell_type = /obj/item/stock_parts/cell/hyeseong_internal_cell
modifystate = FALSE
@@ -256,7 +256,7 @@
//Short version of the above modular rifle, has less charge and different modes
/obj/item/gun/energy/modular_laser_rifle/carbine
name = "\improper Hoshi modular laser carbine"
- icon = 'modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi'
+ icon = 'modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi'
icon_state = "hoshi_kill"
inhand_icon_state = "hoshi_kill"
worn_icon_state = "hoshi_kill"
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm
similarity index 90%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm
index dc5774c96d7..cb6e3ae94d3 100644
--- a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm
+++ b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm
@@ -4,10 +4,10 @@
projectile_type = /obj/projectile/beam/cybersun_laser
e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE * 2)
select_name = "Kill"
- fire_sound = 'modular_zubbers/modules/modular_weapons/sounds/laser_firing/laser.ogg'
+ fire_sound = 'modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/laser.ogg'
/obj/projectile/beam/cybersun_laser
- icon = 'modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi'
+ icon = 'modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi'
icon_state = "kill_large"
damage = 20
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
@@ -20,7 +20,7 @@
projectile_type = /obj/projectile/beam/cybersun_laser/marksman
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE * 2)
select_name = "Marksman"
- fire_sound = 'modular_zubbers/modules/modular_weapons/sounds/laser_firing/vaporize.ogg'
+ fire_sound = 'modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/vaporize.ogg'
/obj/projectile/beam/cybersun_laser/marksman
icon_state = "sniper"
@@ -79,7 +79,7 @@
/obj/projectile/beam/cybersun_laser/granata/proc/fuse_activation(atom/target)
var/obj/item/grenade/shrapnel_maker = new casing_to_spawn(get_turf(target))
shrapnel_maker.detonate()
- playsound(src, 'modular_zubbers/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3)
+ playsound(src, 'modular_zubbers/code/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3)
qdel(shrapnel_maker)
/obj/projectile/beam/cybersun_laser/granata_shrapnel
@@ -108,7 +108,7 @@
pellets = 5
variance = 30
select_name = "Shotgun"
- fire_sound = 'modular_zubbers/modules/modular_weapons/sounds/laser_firing/melt.ogg'
+ fire_sound = 'modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg'
/obj/projectile/beam/cybersun_laser/granata_shrapnel/shotgun_pellet
icon_state = "because_it_doesnt_miss"
@@ -125,7 +125,7 @@
projectile_type = /obj/projectile/beam/cybersun_laser/hellfire
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
select_name = "Incinerate"
- fire_sound = 'modular_zubbers/modules/modular_weapons/sounds/laser_firing/incinerate.ogg'
+ fire_sound = 'modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/incinerate.ogg'
/obj/projectile/beam/cybersun_laser/hellfire
icon_state = "hellfire"
@@ -200,7 +200,7 @@
desc = "A burning glob of green plasma, makes an effective temporary lighting source."
light_range = 4
anchored = TRUE
- icon = 'modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi'
+ icon = 'modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi'
icon_state = "flare_burn"
light_color = COLOR_PALE_GREEN
light_power = 2
@@ -223,7 +223,7 @@
pellets = 3
variance = 15
select_name = "Shotgun"
- fire_sound = 'modular_zubbers/modules/modular_weapons/sounds/laser_firing/melt.ogg'
+ fire_sound = 'modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg'
// Dummy casing that does nothing but have a projectile that looks like a sword
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/ammo.dm b/modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/ammo.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/ammo.dm
rename to modular_zubbers/code/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/ammo.dm
diff --git a/modular_zubbers/modules/modular_weapons/code/gunsets.dm b/modular_zubbers/code/modules/modular_weapons/code/gunsets.dm
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/code/gunsets.dm
rename to modular_zubbers/code/modules/modular_weapons/code/gunsets.dm
diff --git a/modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi b/modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi
rename to modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_lefthand.dmi
diff --git a/modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi b/modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi
rename to modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_righthand.dmi
diff --git a/modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi b/modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi
rename to modular_zubbers/code/modules/modular_weapons/icons/mob/company_and_or_faction_based/saibasan/guns_worn.dmi
diff --git a/modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi b/modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi
rename to modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns32x.dmi
diff --git a/modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi b/modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi
rename to modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/guns48x.dmi
diff --git a/modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi b/modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi
rename to modular_zubbers/code/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi
diff --git a/modular_zubbers/modules/modular_weapons/sounds/grenade_burst.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/grenade_burst.ogg
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/sounds/grenade_burst.ogg
rename to modular_zubbers/code/modules/modular_weapons/sounds/grenade_burst.ogg
diff --git a/modular_zubbers/modules/modular_weapons/sounds/laser_firing/burn.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/burn.ogg
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/sounds/laser_firing/burn.ogg
rename to modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/burn.ogg
diff --git a/modular_zubbers/modules/modular_weapons/sounds/laser_firing/incinerate.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/incinerate.ogg
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/sounds/laser_firing/incinerate.ogg
rename to modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/incinerate.ogg
diff --git a/modular_zubbers/modules/modular_weapons/sounds/laser_firing/laser.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/laser.ogg
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/sounds/laser_firing/laser.ogg
rename to modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/laser.ogg
diff --git a/modular_zubbers/modules/modular_weapons/sounds/laser_firing/melt.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/sounds/laser_firing/melt.ogg
rename to modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg
diff --git a/modular_zubbers/modules/modular_weapons/sounds/laser_firing/vaporize.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/vaporize.ogg
similarity index 100%
rename from modular_zubbers/modules/modular_weapons/sounds/laser_firing/vaporize.ogg
rename to modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/vaporize.ogg
diff --git a/modular_zubbers/modules/more_crushers/code/miningweapons.dm b/modular_zubbers/code/modules/more_crushers/code/miningweapons.dm
similarity index 84%
rename from modular_zubbers/modules/more_crushers/code/miningweapons.dm
rename to modular_zubbers/code/modules/more_crushers/code/miningweapons.dm
index 5b71b460409..71a6bf75573 100644
--- a/modular_zubbers/modules/more_crushers/code/miningweapons.dm
+++ b/modular_zubbers/code/modules/more_crushers/code/miningweapons.dm
@@ -3,12 +3,12 @@
var/acts_as_if_wielded
/obj/item/kinetic_crusher/machete
- icon = 'modular_zubbers/modules/more_crushers/icons/items_and_weapons.dmi'
+ icon = 'modular_zubbers/code/modules/more_crushers/icons/items_and_weapons.dmi'
icon_state = "PKMachete"
inhand_icon_state = "PKMachete0"
- lefthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_lefthand.dmi'
- righthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_righthand.dmi'
- worn_icon = 'modular_zubbers/modules/more_crushers/icons/belt.dmi'
+ lefthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_lefthand.dmi'
+ righthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_righthand.dmi'
+ worn_icon = 'modular_zubbers/code/modules/more_crushers/icons/belt.dmi'
worn_icon_state = "PKMachete0"
name = "proto-kinetic machete"
desc = "Recent breakthroughs with proto-kinetic technology have led to improved designs for the early proto-kinetic crusher, namely the ability to pack all \
@@ -44,12 +44,12 @@
)
/obj/item/kinetic_crusher/spear
- icon = 'modular_zubbers/modules/more_crushers/icons/items_and_weapons.dmi'
+ icon = 'modular_zubbers/code/modules/more_crushers/icons/items_and_weapons.dmi'
icon_state = "PKSpear"
inhand_icon_state = "PKSpear0"
- lefthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_lefthand.dmi'
- righthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_righthand.dmi'
- worn_icon = 'modular_zubbers/modules/more_crushers/icons/back.dmi'
+ lefthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_lefthand.dmi'
+ righthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_righthand.dmi'
+ worn_icon = 'modular_zubbers/code/modules/more_crushers/icons/back.dmi'
worn_icon_state = "PKSpear0"
name = "proto-kinetic spear"
desc = "Having finally invested in better Proto-kinetic tech, research and development was able to cobble together this new proto-kinetic weapon. By compacting all the technology \
@@ -89,12 +89,12 @@
inhand_icon_state = "PKSpear[HAS_TRAIT(src, TRAIT_WIELDED)]" // this is not icon_state and not supported by 2hcomponent
/obj/item/kinetic_crusher/hammer
- icon = 'modular_zubbers/modules/more_crushers/icons/items_and_weapons.dmi'
+ icon = 'modular_zubbers/code/modules/more_crushers/icons/items_and_weapons.dmi'
icon_state = "PKHammer"
inhand_icon_state = "PKHammer0"
- lefthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_lefthand.dmi'
- righthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_righthand.dmi'
- worn_icon = 'modular_zubbers/modules/more_crushers/icons/back.dmi'
+ lefthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_lefthand.dmi'
+ righthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_righthand.dmi'
+ worn_icon = 'modular_zubbers/code/modules/more_crushers/icons/back.dmi'
worn_icon_state = "PKHammer0"
name = "proto-kinetic hammer"
desc = "Somehow research and development managed to make the proto-kinetic crusher even bigger, allowing more parts to be fit inside and increase the power output. \
@@ -139,11 +139,11 @@
inhand_icon_state = "PKHammer[HAS_TRAIT(src, TRAIT_WIELDED)]" // this is not icon_state and not supported by 2hcomponent
/obj/item/kinetic_crusher/claw
- icon = 'modular_zubbers/modules/more_crushers/icons/items_and_weapons.dmi'
+ icon = 'modular_zubbers/code/modules/more_crushers/icons/items_and_weapons.dmi'
icon_state = "PKClaw"
inhand_icon_state = "PKClaw0"
- lefthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_lefthand.dmi'
- righthand_file = 'modular_zubbers/modules/more_crushers/icons/melee_righthand.dmi'
+ lefthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_lefthand.dmi'
+ righthand_file = 'modular_zubbers/code/modules/more_crushers/icons/melee_righthand.dmi'
worn_icon_state = "PKHammer0"
slot_flags = NONE
name = "proto-kinetic claws"
diff --git a/modular_zubbers/modules/more_crushers/icons/back.dmi b/modular_zubbers/code/modules/more_crushers/icons/back.dmi
similarity index 100%
rename from modular_zubbers/modules/more_crushers/icons/back.dmi
rename to modular_zubbers/code/modules/more_crushers/icons/back.dmi
diff --git a/modular_zubbers/modules/more_crushers/icons/belt.dmi b/modular_zubbers/code/modules/more_crushers/icons/belt.dmi
similarity index 100%
rename from modular_zubbers/modules/more_crushers/icons/belt.dmi
rename to modular_zubbers/code/modules/more_crushers/icons/belt.dmi
diff --git a/modular_zubbers/modules/more_crushers/icons/items_and_weapons.dmi b/modular_zubbers/code/modules/more_crushers/icons/items_and_weapons.dmi
similarity index 100%
rename from modular_zubbers/modules/more_crushers/icons/items_and_weapons.dmi
rename to modular_zubbers/code/modules/more_crushers/icons/items_and_weapons.dmi
diff --git a/modular_zubbers/modules/more_crushers/icons/melee_lefthand.dmi b/modular_zubbers/code/modules/more_crushers/icons/melee_lefthand.dmi
similarity index 100%
rename from modular_zubbers/modules/more_crushers/icons/melee_lefthand.dmi
rename to modular_zubbers/code/modules/more_crushers/icons/melee_lefthand.dmi
diff --git a/modular_zubbers/modules/more_crushers/icons/melee_righthand.dmi b/modular_zubbers/code/modules/more_crushers/icons/melee_righthand.dmi
similarity index 100%
rename from modular_zubbers/modules/more_crushers/icons/melee_righthand.dmi
rename to modular_zubbers/code/modules/more_crushers/icons/melee_righthand.dmi
diff --git a/modular_zubbers/modules/pollution/code/perfumes.dm b/modular_zubbers/code/modules/pollution/code/perfumes.dm
similarity index 100%
rename from modular_zubbers/modules/pollution/code/perfumes.dm
rename to modular_zubbers/code/modules/pollution/code/perfumes.dm
diff --git a/modular_zubbers/modules/pollution/code/pollutants_generic.dm b/modular_zubbers/code/modules/pollution/code/pollutants_generic.dm
similarity index 100%
rename from modular_zubbers/modules/pollution/code/pollutants_generic.dm
rename to modular_zubbers/code/modules/pollution/code/pollutants_generic.dm
diff --git a/modular_zubbers/modules/public_logging/public_logging.dm b/modular_zubbers/code/modules/public_logging/public_logging.dm
similarity index 100%
rename from modular_zubbers/modules/public_logging/public_logging.dm
rename to modular_zubbers/code/modules/public_logging/public_logging.dm
diff --git a/modular_zubbers/modules/quirks/code/_quirk.dm b/modular_zubbers/code/modules/quirks/code/_quirk.dm
similarity index 100%
rename from modular_zubbers/modules/quirks/code/_quirk.dm
rename to modular_zubbers/code/modules/quirks/code/_quirk.dm
diff --git a/modular_zubbers/modules/quirks/code/negative_quirks/sensitive_snout.dm b/modular_zubbers/code/modules/quirks/code/negative_quirks/sensitive_snout.dm
similarity index 100%
rename from modular_zubbers/modules/quirks/code/negative_quirks/sensitive_snout.dm
rename to modular_zubbers/code/modules/quirks/code/negative_quirks/sensitive_snout.dm
diff --git a/modular_zubbers/modules/quirks/code/negative_quirks/sol_weakness.dm b/modular_zubbers/code/modules/quirks/code/negative_quirks/sol_weakness.dm
similarity index 100%
rename from modular_zubbers/modules/quirks/code/negative_quirks/sol_weakness.dm
rename to modular_zubbers/code/modules/quirks/code/negative_quirks/sol_weakness.dm
diff --git a/modular_zubbers/modules/quirks/code/neutral_quirks/hungry.dm b/modular_zubbers/code/modules/quirks/code/neutral_quirks/hungry.dm
similarity index 100%
rename from modular_zubbers/modules/quirks/code/neutral_quirks/hungry.dm
rename to modular_zubbers/code/modules/quirks/code/neutral_quirks/hungry.dm
diff --git a/modular_zubbers/modules/quirks/code/neutral_quirks/waddle.dm b/modular_zubbers/code/modules/quirks/code/neutral_quirks/waddle.dm
similarity index 100%
rename from modular_zubbers/modules/quirks/code/neutral_quirks/waddle.dm
rename to modular_zubbers/code/modules/quirks/code/neutral_quirks/waddle.dm
diff --git a/modular_zubbers/code/modules/research/techweb/_techweb.dm b/modular_zubbers/code/modules/research/techweb/_techweb.dm
deleted file mode 100644
index 26f2fd64351..00000000000
--- a/modular_zubbers/code/modules/research/techweb/_techweb.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/techweb
- var/should_generate_points = TRUE
diff --git a/modular_zubbers/modules/security/secmed/automapper.dm b/modular_zubbers/code/modules/security/secmed/automapper.dm
similarity index 100%
rename from modular_zubbers/modules/security/secmed/automapper.dm
rename to modular_zubbers/code/modules/security/secmed/automapper.dm
diff --git a/modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi b/modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi
similarity index 100%
rename from modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi
rename to modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi
diff --git a/modular_zubbers/modules/security/secmed/secmed_clothes.dm b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm
similarity index 100%
rename from modular_zubbers/modules/security/secmed/secmed_clothes.dm
rename to modular_zubbers/code/modules/security/secmed/secmed_clothes.dm
diff --git a/modular_zubbers/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm
similarity index 97%
rename from modular_zubbers/modules/security/secmed/security_medic.dm
rename to modular_zubbers/code/modules/security/secmed/security_medic.dm
index a1f43d322ac..420998bc014 100644
--- a/modular_zubbers/modules/security/secmed/security_medic.dm
+++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm
@@ -86,7 +86,7 @@
/obj/item/radio/headset/headset_medsec
name = "security medic's bowman headset"
desc = "Used to hear how many security officers need to be stitched back together."
- icon = 'modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi'
+ icon = 'modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi'
icon_state = "headset"
keyslot = new /obj/item/encryptionkey/headset_medsec
@@ -97,7 +97,7 @@
/obj/item/clothing/glasses/hud/secmed
name = "security-medical HUD"
desc = "The choice for security medics all across the sector, provides advanced medical and simplified security readings."
- icon = 'modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi'
+ icon = 'modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi'
icon_state = "hud"
worn_icon_state = "healthhud"
hud_type = DATA_HUD_MEDICAL_ADVANCED
diff --git a/modular_zubbers/modules/security_glock/ammo.dm b/modular_zubbers/code/modules/security/security_glock/ammo.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/ammo.dm
rename to modular_zubbers/code/modules/security/security_glock/ammo.dm
diff --git a/modular_zubbers/modules/security_glock/cargo.dm b/modular_zubbers/code/modules/security/security_glock/cargo.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/cargo.dm
rename to modular_zubbers/code/modules/security/security_glock/cargo.dm
diff --git a/modular_zubbers/modules/security_glock/case.dm b/modular_zubbers/code/modules/security/security_glock/case.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/case.dm
rename to modular_zubbers/code/modules/security/security_glock/case.dm
diff --git a/modular_zubbers/modules/security_glock/firing_pin.dm b/modular_zubbers/code/modules/security/security_glock/firing_pin.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/firing_pin.dm
rename to modular_zubbers/code/modules/security/security_glock/firing_pin.dm
diff --git a/modular_zubbers/modules/security_glock/gun.dm b/modular_zubbers/code/modules/security/security_glock/gun.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/gun.dm
rename to modular_zubbers/code/modules/security/security_glock/gun.dm
diff --git a/modular_zubbers/modules/security_glock/lockers.dm b/modular_zubbers/code/modules/security/security_glock/lockers.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/lockers.dm
rename to modular_zubbers/code/modules/security/security_glock/lockers.dm
diff --git a/modular_zubbers/modules/security_glock/research.dm b/modular_zubbers/code/modules/security/security_glock/research.dm
similarity index 100%
rename from modular_zubbers/modules/security_glock/research.dm
rename to modular_zubbers/code/modules/security/security_glock/research.dm
diff --git a/modular_zubbers/modules/shelves/shelf.dm b/modular_zubbers/code/modules/shelves/shelf.dm
similarity index 100%
rename from modular_zubbers/modules/shelves/shelf.dm
rename to modular_zubbers/code/modules/shelves/shelf.dm
diff --git a/modular_zubbers/modules/space_background/parallax.dm b/modular_zubbers/code/modules/space_background/parallax.dm
similarity index 100%
rename from modular_zubbers/modules/space_background/parallax.dm
rename to modular_zubbers/code/modules/space_background/parallax.dm
diff --git a/modular_zubbers/modules/space_background/turf_space.dm b/modular_zubbers/code/modules/space_background/turf_space.dm
similarity index 100%
rename from modular_zubbers/modules/space_background/turf_space.dm
rename to modular_zubbers/code/modules/space_background/turf_space.dm
diff --git a/modular_zubbers/modules/stone/code/stone.dm b/modular_zubbers/code/modules/stone/code/stone.dm
similarity index 100%
rename from modular_zubbers/modules/stone/code/stone.dm
rename to modular_zubbers/code/modules/stone/code/stone.dm
diff --git a/modular_zubbers/modules/synths/code/designs/exofab_designs.dm b/modular_zubbers/code/modules/synths/code/designs/exofab_designs.dm
similarity index 100%
rename from modular_zubbers/modules/synths/code/designs/exofab_designs.dm
rename to modular_zubbers/code/modules/synths/code/designs/exofab_designs.dm
diff --git a/modular_zubbers/modules/synths/code/synth_prefab.dm b/modular_zubbers/code/modules/synths/code/synth_prefab.dm
similarity index 100%
rename from modular_zubbers/modules/synths/code/synth_prefab.dm
rename to modular_zubbers/code/modules/synths/code/synth_prefab.dm
diff --git a/modular_zubbers/modules/synths/death_sound.dm b/modular_zubbers/code/modules/synths/death_sound.dm
similarity index 100%
rename from modular_zubbers/modules/synths/death_sound.dm
rename to modular_zubbers/code/modules/synths/death_sound.dm
diff --git a/modular_zubbers/modules/title_screen/code/title_screen_subsystem.dm b/modular_zubbers/code/modules/title_screen/code/title_screen_subsystem.dm
similarity index 100%
rename from modular_zubbers/modules/title_screen/code/title_screen_subsystem.dm
rename to modular_zubbers/code/modules/title_screen/code/title_screen_subsystem.dm
diff --git a/modular_zubbers/code/modules/command_vendor/vending.dm b/modular_zubbers/code/modules/vending/comdrobe.dm
similarity index 100%
rename from modular_zubbers/code/modules/command_vendor/vending.dm
rename to modular_zubbers/code/modules/vending/comdrobe.dm
diff --git a/modular_zubbers/code/modules/vending/megaseed.dm b/modular_zubbers/code/modules/vending/megaseed.dm
new file mode 100644
index 00000000000..040d9a194db
--- /dev/null
+++ b/modular_zubbers/code/modules/vending/megaseed.dm
@@ -0,0 +1,10 @@
+/obj/machinery/vending/hydroseeds //feed and seed
+ zubbers_product_categories = list(
+ list(
+ "name" = "Fruits",
+ "icon" = "apple-whole",
+ "products" = list (
+ /obj/item/seeds/rockfruit = 3,
+ ),
+ ),
+ )
diff --git a/modular_zubbers/modules/vending/vending.dm b/modular_zubbers/code/modules/vending/vending.dm
similarity index 100%
rename from modular_zubbers/modules/vending/vending.dm
rename to modular_zubbers/code/modules/vending/vending.dm
diff --git a/modular_zubbers/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm
similarity index 100%
rename from modular_zubbers/modules/vending/wardrobe.dm
rename to modular_zubbers/code/modules/vending/wardrobe.dm
diff --git a/modular_zubbers/modules/vetted/examine.dm b/modular_zubbers/code/modules/vetted/examine.dm
similarity index 100%
rename from modular_zubbers/modules/vetted/examine.dm
rename to modular_zubbers/code/modules/vetted/examine.dm
diff --git a/modular_zubbers/modules/vetted/overrides/erp_preferences.dm b/modular_zubbers/code/modules/vetted/overrides/erp_preferences.dm
similarity index 100%
rename from modular_zubbers/modules/vetted/overrides/erp_preferences.dm
rename to modular_zubbers/code/modules/vetted/overrides/erp_preferences.dm
diff --git a/modular_zubbers/modules/vetted/vetted.dm b/modular_zubbers/code/modules/vetted/vetted.dm
similarity index 100%
rename from modular_zubbers/modules/vetted/vetted.dm
rename to modular_zubbers/code/modules/vetted/vetted.dm
diff --git a/modular_zubbers/modules/voting/_votes.dm b/modular_zubbers/code/modules/voting/_votes.dm
similarity index 100%
rename from modular_zubbers/modules/voting/_votes.dm
rename to modular_zubbers/code/modules/voting/_votes.dm
diff --git a/modular_zubbers/modules/voting/living_timer.dm b/modular_zubbers/code/modules/voting/living_timer.dm
similarity index 100%
rename from modular_zubbers/modules/voting/living_timer.dm
rename to modular_zubbers/code/modules/voting/living_timer.dm
diff --git a/modular_zubbers/modules/voting/vote_overrides.dm b/modular_zubbers/code/modules/voting/vote_overrides.dm
similarity index 100%
rename from modular_zubbers/modules/voting/vote_overrides.dm
rename to modular_zubbers/code/modules/voting/vote_overrides.dm
diff --git a/modular_zubbers/modules/customization/icons/mutant_bodyparts.dmi b/modular_zubbers/icons/customization/mutant_bodyparts.dmi
similarity index 100%
rename from modular_zubbers/modules/customization/icons/mutant_bodyparts.dmi
rename to modular_zubbers/icons/customization/mutant_bodyparts.dmi
diff --git a/modular_zubbers/modules/customization/icons/wings.dmi b/modular_zubbers/icons/customization/wings.dmi
similarity index 100%
rename from modular_zubbers/modules/customization/icons/wings.dmi
rename to modular_zubbers/icons/customization/wings.dmi
diff --git a/modular_zubbers/modules/arcades/code/loot/~arcade_weights_final.dm b/modular_zubbers/modules/arcades/code/loot/~arcade_weights_final.dm
deleted file mode 100644
index 7e15bf44cc1..00000000000
--- a/modular_zubbers/modules/arcades/code/loot/~arcade_weights_final.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-GLOBAL_LIST_INIT(arcade_prize_pool, list(
- GLOB.arcade_prize_pool_classic = 5000,
- GLOB.arcade_prize_pool_toy = 2500,
- GLOB.arcade_prize_pool_mechanical = 1000,
- GLOB.arcade_prize_pool_special = 250,
- GLOB.arcade_prize_pool_oh_god = 1
-))
- // UNTICKED, COME BACK LATER AND OVERRIDE
diff --git a/modular_zubbers/modules/automapper/code/area_spawn_entries.dm b/modular_zubbers/modules/automapper/code/area_spawn_entries.dm
deleted file mode 100644
index 57638223e3e..00000000000
--- a/modular_zubbers/modules/automapper/code/area_spawn_entries.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/area_spawn/lustwish_prison
- desired_atom = /obj/machinery/vending/dorms/prison // PRISON LUSTWISH
diff --git a/modular_zubbers/modules/borgs/code/robot_defines.dm b/modular_zubbers/modules/borgs/code/robot_defines.dm
deleted file mode 100644
index 1b38d0b7260..00000000000
--- a/modular_zubbers/modules/borgs/code/robot_defines.dm
+++ /dev/null
@@ -1,101 +0,0 @@
-// Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format
-
-#define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_cc.dmi'
-#define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_cc.dmi'
-
-#define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_clown.dmi'
-
-#define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_med.dmi'
-#define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_med.dmi'
-
-#define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_cargo.dmi'
-#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_cargo.dmi'
-
-#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_sec.dmi'
-#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_sec.dmi'
-
-#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_eng.dmi'
-#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_eng.dmi'
-
-#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_pk.dmi'
-#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/modules/borgs/sprites/tallrobot_pk.dmi'
-#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_pk.dmi'
-
-#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_serv.dmi'
-#define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_serv.dmi'
-
-#define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_mine.dmi'
-#define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_mine.dmi'
-
-#define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_jani.dmi'
-#define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_jani.dmi'
-
-#define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_syndie.dmi'
-#define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_syndie.dmi'
-
-#define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/modules/borgs/sprites/widerobot_ninja.dmi'
-#define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_ninja.dmi'
-
-#define CYBORG_ICON_TYPE_RAPTOR "raptor"
-
-#define CYBORG_ICON_SCI_WIDE 'modular_zubbers/modules/borgs/sprites/widerobot_sci.dmi'
-#define CYBORG_ICON_SCI_TALL 'modular_zubbers/modules/borgs/sprites/tallrobot_sci.dmi'
-#define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/modules/borgs/sprites/largerobot_sci.dmi'
-#define CYBORG_ICON_SCI 'modular_zubbers/modules/borgs/sprites/robot_sci.dmi'
-
-#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
-
-#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_gen.dmi'
-#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_sci.dmi'
-#define CYBORG_ICON_ENG_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_eng.dmi'
-#define CYBORG_ICON_MED_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_med.dmi'
-#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_car.dmi'
-#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_serv.dmi'
-#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_pk.dmi'
-#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_jani.dmi'
-#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_min.dmi'
-#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/modules/borgs/sprites/smallraptors/smolraptor_cc.dmi'
-
-//F3-LINE cyborgs
-#define CYBORG_ICON_ALL_CATBORG 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi'
-
-#define CYBORG_ICON_TYPE_GEN_CATBORG "FELI-Standard"
-#define CYBORG_ICON_TYPE_SCI_CATBORG "FELI-Research"
-#define CYBORG_ICON_TYPE_ENG_CATBORG "FELI-Engineer"
-#define CYBORG_ICON_TYPE_MED_CATBORG "FELI-Medical"
-#define CYBORG_ICON_TYPE_SERV_CATBORG "FELI-Service"
-#define CYBORG_ICON_TYPE_PK_CATBORG "FELI-Pk"
-#define CYBORG_ICON_TYPE_JANI_CATBORG "FELI-Janitor"
-#define CYBORG_ICON_TYPE_MINE_CATBORG "FELI-Mining"
-#define CYBORG_ICON_TYPE_SEC_CATBORG "FELI-Security"
-#define CYBORG_ICON_TYPE_SYNDI_CATBORG "FELI-Combat"
-#define CYBORG_ICON_TYPE_NINJA_CATBORG "FELI-Ninja"
-
-/mob/living/silicon/robot/model/centcom
- icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER
- icon_state = "valecc"
- faction = list(ROLE_DEATHSQUAD)
- req_access = list(ACCESS_CENT_GENERAL)
- lawupdate = FALSE
- scrambledcodes = TRUE // These are not station borgs.
- ionpulse = TRUE
- var/playstyle_string = "You are a Central Command cyborg!
"
- set_model = /obj/item/robot_model/centcom
- cell = /obj/item/stock_parts/cell/bluespace
-
-/mob/living/silicon/robot/model/centcom/Initialize(mapload)
- laws = new /datum/ai_laws/central_override()
- laws.associate(src)
- . = ..()
- addtimer(CALLBACK(src, PROC_REF(show_playstyle)), 0.5 SECONDS)
-
-/mob/living/silicon/robot/model/centcom/proc/show_playstyle()
- if(playstyle_string)
- to_chat(src, playstyle_string)
-
-/mob/living/silicon/robot/model/centcom/ResetModel()
- return
-
-//Research cyborgs
-/mob/living/silicon/robot/model/sci
- icon_state = "research"
diff --git a/modular_zubbers/modules/clothing/code/donator_clothing.dm b/modular_zubbers/modules/clothing/code/donator_clothing.dm
deleted file mode 100644
index a178710420b..00000000000
--- a/modular_zubbers/modules/clothing/code/donator_clothing.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/obj/item/clothing/suit/toggle/labcoat/vic_dresscoat_donator // modified on request of nikotheguydude, the person who donated for this upstream
- name = "elaborate dresscoat"
- special_desc = "On a closer inspection, it would appear the interior is modified with protective material and mounting points \
- most often found on medical labcoats."
diff --git a/modular_zubbers/modules/clothing/code/head/helmet.dm b/modular_zubbers/modules/clothing/code/head/helmet.dm
deleted file mode 100644
index 1c8f3c56ae4..00000000000
--- a/modular_zubbers/modules/clothing/code/head/helmet.dm
+++ /dev/null
@@ -1,46 +0,0 @@
-/obj/item/clothing/head/helmet/toggleable/pinwheel //sprites by Keila
- name = "pinwheel hat"
- desc = "Space Jesus gives his silliest hats to his most whimsical of goobers."
- icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
- icon_state = "pinwheel"
- inhand_icon_state = null
- lefthand_file = null
- righthand_file = null
- armor_type = /datum/armor/none
- clothing_flags = null
- flags_cover = null
- flags_inv = null
- toggle_message = "You stop the spinner on"
- alt_toggle_message = "You spin the spinner on"
- actions_types = list(/datum/action/item_action/toggle_helmet_light)
- ///Cooldown for toggling the spinner.
- COOLDOWN_DECLARE(pinwheel_toggle_cooldown)
-
-/obj/item/clothing/head/helmet/toggleable/pinwheel/adjust_visor()
- if(!COOLDOWN_FINISHED(src, pinwheel_toggle_cooldown))
- return FALSE
- COOLDOWN_START(src, pinwheel_toggle_cooldown, 1 SECONDS)
- return TRUE
-
-/obj/item/clothing/head/helmet/toggleable/pinwheel/gold
- name = "magnificent pinwheel hat"
- desc = "The strongest possible pinwheel pinwheel hat. Such is fate that the silliest things in the world are also the most beautiful; others may not see the shine in you, but the magnificent pinwheel hat does. It appreciates you for who you are and what you've done. It feels alive, and makes you feel alive too. You see the totality of existence reflected in the golden shimmer of the pin." //Does literally nothing more than the regular pinwheel hat. Just for emphasis.
- icon_state = "pinwheel_gold"
-
-
-//Clussy and Jester sprites from Splurt.
-/obj/item/clothing/head/costume/bubber/jester
- name = "amazing jester hat"
- desc = "It's my money, it's my game, Kill Jester."
- icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
- icon_state = "striped_jester_hat"
-
-/obj/item/clothing/head/costume/bubber/clussy
- name = "pink clown wig"
- desc = "Did you know that the first Wig was made for John William Whig, founder of the Whig Party? They only allowed bald men until the year 1972, when the party became unpopular."
- icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi'
- worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi'
- icon_state = "clussy_wig"
- flags_inv = HIDEHAIR
diff --git a/modular_zubbers/modules/clothing/code/sprite_accessories/sprite_accessories.dm b/modular_zubbers/modules/clothing/code/sprite_accessories/sprite_accessories.dm
deleted file mode 100644
index 9d8c8ec79d2..00000000000
--- a/modular_zubbers/modules/clothing/code/sprite_accessories/sprite_accessories.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/datum/sprite_accessory/bra/cowprint
- name = "Bra - Cowprint"
- icon = 'modular_zubbers/master_files/icons/mob/sprite_accessory/clothing.dmi'
- icon_state = "bra_cowprint"
- gender = FEMALE
- use_static = TRUE
-
-/datum/sprite_accessory/underwear/cowprint
- name = "Panties - Cowprint"
- icon = 'modular_zubbers/master_files/icons/mob/sprite_accessory/clothing.dmi'
- icon_state = "underwear_cowprint"
- gender = FEMALE
- use_static = TRUE
diff --git a/modular_zubbers/modules/hemophages/code/limbgrower.dm b/modular_zubbers/modules/hemophages/code/limbgrower.dm
deleted file mode 100644
index 3bc5f86db1d..00000000000
--- a/modular_zubbers/modules/hemophages/code/limbgrower.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/obj/machinery/limbgrower/Initialize(mapload)
- categories += list(
- SPECIES_HEMOPHAGE,
- SPECIES_TAJARAN
- )
- . = ..()
diff --git a/modular_zubbers/modules/hydroponics/code/vending/megaseed.dm b/modular_zubbers/modules/hydroponics/code/vending/megaseed.dm
deleted file mode 100644
index 562529c8c61..00000000000
--- a/modular_zubbers/modules/hydroponics/code/vending/megaseed.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/obj/machinery/vending/hydroseeds/Initialize(mapload)
- for(var/category in product_categories)
- if(category["name"] == "Fruits")
- category["products"] += list(/obj/item/seeds/rockfruit = 3)
-
- return ..()
diff --git a/modular_zubbers/modules/jobs/code/job_types/quartermaster.dm b/modular_zubbers/modules/jobs/code/job_types/quartermaster.dm
deleted file mode 100644
index dc80e89c0f8..00000000000
--- a/modular_zubbers/modules/jobs/code/job_types/quartermaster.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/outfit/job/quartermaster
- glasses = /obj/item/clothing/glasses/hud/gun_permit/sunglasses
diff --git a/modular_zubbers/modules/normalized_syndie_clothing_4_tesh/unsorted_clothes.dm b/modular_zubbers/modules/normalized_syndie_clothing_4_tesh/unsorted_clothes.dm
deleted file mode 100644
index ae195af7db7..00000000000
--- a/modular_zubbers/modules/normalized_syndie_clothing_4_tesh/unsorted_clothes.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-/obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured
- name = "utility overalls turtleneck"
- desc = "A pair of spiffy overalls with a turtleneck underneath, useful for both engineering and botanical work."
- icon_state = "syndicate_overalls"
- armor_type = /datum/armor/clothing_under/none
- has_sensor = HAS_SENSORS
- can_adjust = TRUE
-
-/datum/loadout_item/under/miscellaneous/syndicate_skyrat_overalls_unarmoured
- name = "Tacticool Utility Overalls"
- item_path = /obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured
-
-/obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured/skirt
- name = "utility overalls skirtleneck"
- desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy."
- icon_state = "syndicate_overallskirt"
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
- dying_key = DYE_REGISTRY_JUMPSKIRT
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/datum/loadout_item/under/miscellaneous/syndicate_skyrat_overalls_unarmoured_skirt
- name = "Tacticool Utility Skirt and Suspenders"
- item_path = /obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured/skirt
-
-/obj/item/clothing/mask/gas/sechailer/half_mask
- name = "tacticool neck gaiter"
- desc = "A black techwear mask. Its low-profile design contrasts with the edge. Has a small respirator to be used with internals."
- actions_types = list(/datum/action/item_action/adjust)
- alternate_worn_layer = BODY_FRONT_UNDER_CLOTHES
- icon_state = "half_mask"
- icon = 'modular_skyrat/master_files/icons/obj/clothing/masks.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/mask.dmi'
- unique_death = 'modular_skyrat/master_files/sound/effects/hacked.ogg'
- voice_filter = null
- use_radio_beeps_tts = FALSE
-
-/datum/loadout_item/mask/sechailer_half_mask
- name = "Tacticool Half-Mask"
- item_path = /obj/item/clothing/mask/gas/sechailer/half_mask
-
diff --git a/tgstation.dme b/tgstation.dme
index cc252e9df35..38aa6bdc1eb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8392,6 +8392,7 @@
#include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm"
#include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm"
#include "modular_zubbers\code\__DEFINES\bloodsucker_defines.dm"
+#include "modular_zubbers\code\__DEFINES\guardian_defines.dm"
#include "modular_zubbers\code\__DEFINES\moonstation_defines.dm"
#include "modular_zubbers\code\__DEFINES\send2relay.dm"
#include "modular_zubbers\code\__DEFINES\traits.dm"
@@ -8402,6 +8403,7 @@
#include "modular_zubbers\code\_globalvars\lists\maintenance_loot_trash.dm"
#include "modular_zubbers\code\_globalvars\lists\maintenance_loot_uncommon.dm"
#include "modular_zubbers\code\_globalvars\lists\quirks.dm"
+#include "modular_zubbers\code\_globalvars\lists\text.dm"
#include "modular_zubbers\code\_globalvars\lists\~maintenance_loot.dm"
#include "modular_zubbers\code\controllers\subsystem\air.dm"
#include "modular_zubbers\code\controllers\subsystem\mapping.dm"
@@ -8581,17 +8583,37 @@
#include "modular_zubbers\code\modules\antagonists\bloodsucker\vassal\vassal_types\revenge_vassal.dm"
#include "modular_zubbers\code\modules\antagonists\malf\doomsday.dm"
#include "modular_zubbers\code\modules\antagonists\malf\remove_malf.dm"
+#include "modular_zubbers\code\modules\antagonists\nightmare\nightmare_species.dm"
#include "modular_zubbers\code\modules\antagonists\wizard\events_removal.dm"
#include "modular_zubbers\code\modules\antagonists\wizard\events_rework.dm"
#include "modular_zubbers\code\modules\antagonists\wizard\grand_finale_removal.dm"
-#include "modular_zubbers\code\modules\ashwalker_names\ashwalker_names.dm"
+#include "modular_zubbers\code\modules\arcades\assets\arcade.dm"
+#include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_classic.dm"
+#include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_mechanical.dm"
+#include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_oh_god.dm"
+#include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_special.dm"
+#include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_toy.dm"
+#include "modular_zubbers\code\modules\arcades\code\minesweeper\minesweeper.dm"
+#include "modular_zubbers\code\modules\arcades\code\overrides\spawners.dm"
+#include "modular_zubbers\code\modules\ashwalkers\ashwalker_names.dm"
+#include "modular_zubbers\code\modules\ashwalkers\code\effects\ash_rituals.dm"
#include "modular_zubbers\code\modules\atmospherics\gasmixtures\gas_types.dm"
#include "modular_zubbers\code\modules\atmospherics\machinery\air_alarm\_air_alarm.dm"
#include "modular_zubbers\code\modules\atmospherics\machinery\portable\canister.dm"
#include "modular_zubbers\code\modules\automapper\code\area_spawn_entries.dm"
+#include "modular_zubbers\code\modules\automapper\code\overrides\area_spawn_subsystem.dm"
#include "modular_zubbers\code\modules\bitrunning\disks.dm"
+#include "modular_zubbers\code\modules\blooper\atoms_movable.dm"
+#include "modular_zubbers\code\modules\blooper\bark.dm"
+#include "modular_zubbers\code\modules\blooper\bark_list.dm"
#include "modular_zubbers\code\modules\borer_hud\borer.dm"
+#include "modular_zubbers\code\modules\borgs\code\robot_defense.dm"
+#include "modular_zubbers\code\modules\borgs\code\robot_defines.dm"
+#include "modular_zubbers\code\modules\borgs\code\robot_items.dm"
+#include "modular_zubbers\code\modules\borgs\code\robot_model.dm"
+#include "modular_zubbers\code\modules\borgs\code\robot_upgrade.dm"
#include "modular_zubbers\code\modules\bsrpd\code\bsrpd.dm"
+#include "modular_zubbers\code\modules\bubber_tram\code\moonstation_tram.dm"
#include "modular_zubbers\code\modules\cargo\expressconsole.dm"
#include "modular_zubbers\code\modules\cargo\bounties\blacksmith.dm"
#include "modular_zubbers\code\modules\cargo\bounties\prisoner.dm"
@@ -8601,11 +8623,20 @@
#include "modular_zubbers\code\modules\cargo\packs\metalsheets.dm"
#include "modular_zubbers\code\modules\cargo\packs\security.dm"
#include "modular_zubbers\code\modules\cargo\packs\service.dm"
+#include "modular_zubbers\code\modules\client\chat_color.dm"
+#include "modular_zubbers\code\modules\client\examine_tgui.dm"
+#include "modular_zubbers\code\modules\client\ssd.dm"
#include "modular_zubbers\code\modules\client\autopunctuation\preferences.dm"
+#include "modular_zubbers\code\modules\client\flavor_text\flavor_text.dm"
+#include "modular_zubbers\code\modules\client\preferences\preferences.dm"
#include "modular_zubbers\code\modules\client\preferences\middleware\species.dm"
#include "modular_zubbers\code\modules\client\verbs\character_directory.dm"
+#include "modular_zubbers\code\modules\clothing\_job.dm"
+#include "modular_zubbers\code\modules\clothing\donator_clothing.dm"
#include "modular_zubbers\code\modules\clothing\undershirt.dm"
+#include "modular_zubbers\code\modules\clothing\armor_overrides\hos_armor.dm"
#include "modular_zubbers\code\modules\clothing\glasses\nerd.dm"
+#include "modular_zubbers\code\modules\clothing\gloves\clown.dm"
#include "modular_zubbers\code\modules\clothing\gloves\misc.dm"
#include "modular_zubbers\code\modules\clothing\gloves\syndicate.dm"
#include "modular_zubbers\code\modules\clothing\gloves\bracers\armwraps.dm"
@@ -8613,27 +8644,29 @@
#include "modular_zubbers\code\modules\clothing\head\jobs.dm"
#include "modular_zubbers\code\modules\clothing\head\syndicate.dm"
#include "modular_zubbers\code\modules\clothing\head\wig.dm"
+#include "modular_zubbers\code\modules\clothing\mask\clown.dm"
#include "modular_zubbers\code\modules\clothing\neck\collars.dm"
#include "modular_zubbers\code\modules\clothing\outfits\lace.dm"
#include "modular_zubbers\code\modules\clothing\outfits\outlast.dm"
#include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm"
#include "modular_zubbers\code\modules\clothing\outfits\prison_headset.dm"
#include "modular_zubbers\code\modules\clothing\shoes\boots.dm"
+#include "modular_zubbers\code\modules\clothing\shoes\clown.dm"
#include "modular_zubbers\code\modules\clothing\suits\armor.dm"
#include "modular_zubbers\code\modules\clothing\suits\jacket.dm"
#include "modular_zubbers\code\modules\clothing\suits\misc.dm"
#include "modular_zubbers\code\modules\clothing\suits\nerd.dm"
#include "modular_zubbers\code\modules\clothing\under\_under.dm"
+#include "modular_zubbers\code\modules\clothing\under\clown.dm"
#include "modular_zubbers\code\modules\clothing\under\misc.dm"
+#include "modular_zubbers\code\modules\clothing\under\security.dm"
#include "modular_zubbers\code\modules\clothing\under\skirts_dresses.dm"
#include "modular_zubbers\code\modules\clothing\under\syndicate.dm"
#include "modular_zubbers\code\modules\clothing\under\jobs\command.dm"
#include "modular_zubbers\code\modules\clothing_reskins\redsec.dm"
-#include "modular_zubbers\code\modules\command_vendor\vending.dm"
+#include "modular_zubbers\code\modules\colony_fabricator\code\design_datums\fabricator_flag_additions\tools.dm"
#include "modular_zubbers\code\modules\contractor\code\items\boxes.dm"
#include "modular_zubbers\code\modules\credits\credits.dm"
-#include "modular_zubbers\code\modules\customization\modules\clothing\under\security.dm"
-#include "modular_zubbers\code\modules\customization\modules\jobs\_job.dm"
#include "modular_zubbers\code\modules\customization\sprite_accessories\64_wings.dm"
#include "modular_zubbers\code\modules\customization\sprite_accessories\ears.dm"
#include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm"
@@ -8658,9 +8691,12 @@
#include "modular_zubbers\code\modules\designs\limbgrower_designs.dm"
#include "modular_zubbers\code\modules\disease\hidden.dm"
#include "modular_zubbers\code\modules\dynamic\midround_rulesets.dm"
+#include "modular_zubbers\code\modules\emotes\emotes.dm"
#include "modular_zubbers\code\modules\emotes\scream_datums.dm"
#include "modular_zubbers\code\modules\emotes\species_screams.dm"
+#include "modular_zubbers\code\modules\emotes\synth_emotes.dm"
#include "modular_zubbers\code\modules\emp_overhaul\organ.dm"
+#include "modular_zubbers\code\modules\ert_overrides\modified_equipement.dm"
#include "modular_zubbers\code\modules\events\ghost_role\blob.dm"
#include "modular_zubbers\code\modules\experisci\experiment\types\scanning_fish.dm"
#include "modular_zubbers\code\modules\fishing\fishing_minigame.dm"
@@ -8670,11 +8706,16 @@
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
#include "modular_zubbers\code\modules\GAGS\greyscale_configs.dm"
#include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"
+#include "modular_zubbers\code\modules\gladiator\code\game\objects\items\gladiator_items.dm"
+#include "modular_zubbers\code\modules\hacks\atmos\force_atmos.dm"
#include "modular_zubbers\code\modules\height_scaling\icons.dm"
#include "modular_zubbers\code\modules\height_scaling\preferences.dm"
#include "modular_zubbers\code\modules\hydroponics\gene_modder.dm"
#include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
+#include "modular_zubbers\code\modules\hydroponics\code\grown\rocks.dm"
+#include "modular_zubbers\code\modules\hydroponics\code\plantgenes\hydroponics.dm"
#include "modular_zubbers\code\modules\job_estimation\code\dead.dm"
+#include "modular_zubbers\code\modules\job_exempt\job_exempt.dm"
#include "modular_zubbers\code\modules\jobs\_job.dm"
#include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
#include "modular_zubbers\code\modules\jobs\job_types\blueshield.dm"
@@ -8683,8 +8724,17 @@
#include "modular_zubbers\code\modules\jobs\job_types\clown.dm"
#include "modular_zubbers\code\modules\jobs\job_types\curator.dm"
#include "modular_zubbers\code\modules\jobs\job_types\nanotrasen_consultant.dm"
+#include "modular_zubbers\code\modules\jobs\job_types\quartermaster.dm"
#include "modular_zubbers\code\modules\jobs\job_types\roboticist.dm"
+#include "modular_zubbers\code\modules\jobs\job_types\warden.dm"
+#include "modular_zubbers\code\modules\jobs\trims\jobs.dm"
+#include "modular_zubbers\code\modules\languages\_language_holder.dm"
+#include "modular_zubbers\code\modules\languages\common.dm"
#include "modular_zubbers\code\modules\languages\empathy.dm"
+#include "modular_zubbers\code\modules\languages\nekomimetic.dm"
+#include "modular_zubbers\code\modules\languages\panslavic.dm"
+#include "modular_zubbers\code\modules\languages\piratespeak.dm"
+#include "modular_zubbers\code\modules\languages\siikmaas.dm"
#include "modular_zubbers\code\modules\languages\vampiric.dm"
#include "modular_zubbers\code\modules\lewd_machinery\lustwish.dm"
#include "modular_zubbers\code\modules\liquids\height_floors.dm"
@@ -8692,6 +8742,7 @@
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_gloves.dm"
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_heads.dm"
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_inhands.dm"
+#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_masks.dm"
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_neck.dm"
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_pocket.dm"
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_shoes.dm"
@@ -8699,18 +8750,27 @@
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_toys.dm"
#include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_under.dm"
#include "modular_zubbers\code\modules\loadouts\overrides\loadout_items\loadout_datum.dm"
+#include "modular_zubbers\code\modules\lunchbox\code\lunchbox.dm"
#include "modular_zubbers\code\modules\mapping\access_helpers.dm"
#include "modular_zubbers\code\modules\mapping\limastation\areas.dm"
#include "modular_zubbers\code\modules\mapping\limastation\shuttles.dm"
#include "modular_zubbers\code\modules\mapping\limastation\static_plaque.dm"
+#include "modular_zubbers\code\modules\mapping\ss13_construct\areas.dm"
#include "modular_zubbers\code\modules\mining\shelters.dm"
#include "modular_zubbers\code\modules\mining\equipment\survival_pod.dm"
#include "modular_zubbers\code\modules\mining\lavaland\megafauna_loot.dm"
#include "modular_zubbers\code\modules\mining\lavaland\equipment\kinetic_crusher.dm"
#include "modular_zubbers\code\modules\mining\lavaland\equipment\mining_tools.dm"
#include "modular_zubbers\code\modules\mining\lavaland\megafauna\hierophant.dm"
+#include "modular_zubbers\code\modules\mob\dead\taur_types.dm"
#include "modular_zubbers\code\modules\mob\dead\new_player\body_markings.dm"
#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories.dm"
+#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories\fluff.dm"
+#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories\hair.dm"
+#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories\horns.dm"
+#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories\ipc.dm"
+#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories\skrell_hair.dm"
+#include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories\wings.dm"
#include "modular_zubbers\code\modules\mob\living\examine.dm"
#include "modular_zubbers\code\modules\mob\living\living.dm"
#include "modular_zubbers\code\modules\mob\living\basic\guardian\guardian_types\holoparasite_timestop.dm"
@@ -8723,6 +8783,9 @@
#include "modular_zubbers\code\modules\mob\living\carbon\alien\adult\adult.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\_species.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm"
+#include "modular_zubbers\code\modules\mob\living\carbon\human\species\akula.dm"
+#include "modular_zubbers\code\modules\mob\living\carbon\human\species\tajaran.dm"
+#include "modular_zubbers\code\modules\mob\living\carbon\human\species\xeno.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\abductor.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\humanoid_overrides.dm"
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
@@ -8735,9 +8798,26 @@
#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\hemophage\hemophage_species.dm"
#include "modular_zubbers\code\modules\mob\living\simple_animal\guardian\guardian.dm"
#include "modular_zubbers\code\modules\mob\living\simple_animal\hostile\megafauna\drake.dm"
+#include "modular_zubbers\code\modules\mob\living\simple_animal\hostile\megafauna\horror_ling.dm"
#include "modular_zubbers\code\modules\mod\mod_ai.dm"
#include "modular_zubbers\code\modules\mod\mod_theme.dm"
#include "modular_zubbers\code\modules\mod\mod_types.dm"
+#include "modular_zubbers\code\modules\mod\modules.dm"
+#include "modular_zubbers\code\modules\modular_items\code\cake_light.dm"
+#include "modular_zubbers\code\modules\modular_items\code\necklace.dm"
+#include "modular_zubbers\code\modules\modular_items\code\recipes_misc.dm"
+#include "modular_zubbers\code\modules\modular_items\code\food_and_drinks\food\meatslab.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\gunsets.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\carwo.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\ammobox.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\carwo.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\saibasan\laser_guns.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\saibasan\mode_datums.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\saibasan\projectiles.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\magazines.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\pistol.dm"
+#include "modular_zubbers\code\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\ammo.dm"
+#include "modular_zubbers\code\modules\more_crushers\code\miningweapons.dm"
#include "modular_zubbers\code\modules\movespeed\modifiers\status_effects.dm"
#include "modular_zubbers\code\modules\opposing_force\code\items.dm"
#include "modular_zubbers\code\modules\opposing_force\code\equipment\antagonist_powers.dm"
@@ -8746,6 +8826,8 @@
#include "modular_zubbers\code\modules\paperwork\folders_premade.dm"
#include "modular_zubbers\code\modules\paperwork\paper_premade.dm"
#include "modular_zubbers\code\modules\paperwork\stamps.dm"
+#include "modular_zubbers\code\modules\pollution\code\perfumes.dm"
+#include "modular_zubbers\code\modules\pollution\code\pollutants_generic.dm"
#include "modular_zubbers\code\modules\power\powerator.dm"
#include "modular_zubbers\code\modules\power\supermatter\supermatter_gas.dm"
#include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\smg.dm"
@@ -8754,6 +8836,12 @@
#include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
#include "modular_zubbers\code\modules\projectiles\projectile\bullets\smg.dm"
#include "modular_zubbers\code\modules\protected_roles\code\antag_restricted_jobs.dm"
+#include "modular_zubbers\code\modules\public_logging\public_logging.dm"
+#include "modular_zubbers\code\modules\quirks\code\_quirk.dm"
+#include "modular_zubbers\code\modules\quirks\code\negative_quirks\sensitive_snout.dm"
+#include "modular_zubbers\code\modules\quirks\code\negative_quirks\sol_weakness.dm"
+#include "modular_zubbers\code\modules\quirks\code\neutral_quirks\hungry.dm"
+#include "modular_zubbers\code\modules\quirks\code\neutral_quirks\waddle.dm"
#include "modular_zubbers\code\modules\reagents\drink_reagents.dm"
#include "modular_zubbers\code\modules\reagents\chemistry\reagents\food_reagents.dm"
#include "modular_zubbers\code\modules\reagents\reagent_containers\condiment.dm"
@@ -8765,14 +8853,28 @@
#include "modular_zubbers\code\modules\research\designs\misc_designs.dm"
#include "modular_zubbers\code\modules\research\designs\nerd_designs.dm"
#include "modular_zubbers\code\modules\research\techweb\all_nodes.dm"
+#include "modular_zubbers\code\modules\security\secmed\automapper.dm"
+#include "modular_zubbers\code\modules\security\secmed\secmed_clothes.dm"
+#include "modular_zubbers\code\modules\security\secmed\security_medic.dm"
+#include "modular_zubbers\code\modules\security\security_glock\ammo.dm"
+#include "modular_zubbers\code\modules\security\security_glock\cargo.dm"
+#include "modular_zubbers\code\modules\security\security_glock\case.dm"
+#include "modular_zubbers\code\modules\security\security_glock\firing_pin.dm"
+#include "modular_zubbers\code\modules\security\security_glock\gun.dm"
+#include "modular_zubbers\code\modules\security\security_glock\lockers.dm"
+#include "modular_zubbers\code\modules\security\security_glock\research.dm"
#include "modular_zubbers\code\modules\security_levels\security_level_datums.dm"
+#include "modular_zubbers\code\modules\shelves\shelf.dm"
#include "modular_zubbers\code\modules\skub\skub.dm"
+#include "modular_zubbers\code\modules\space_background\parallax.dm"
+#include "modular_zubbers\code\modules\space_background\turf_space.dm"
#include "modular_zubbers\code\modules\spells\banhammer_item.dm"
#include "modular_zubbers\code\modules\spells\spell_types\disabled_spells.dm"
#include "modular_zubbers\code\modules\spells\spell_types\nerfed_spells.dm"
#include "modular_zubbers\code\modules\status_effects\buffs\frenzy.dm"
#include "modular_zubbers\code\modules\status_indicators\status_indicator.dm"
#include "modular_zubbers\code\modules\status_indicators\status_indicator_pref.dm"
+#include "modular_zubbers\code\modules\stone\code\stone.dm"
#include "modular_zubbers\code\modules\storyteller\config.dm"
#include "modular_zubbers\code\modules\storyteller\divergency_report.dm"
#include "modular_zubbers\code\modules\storyteller\gamemode.dm"
@@ -8802,12 +8904,26 @@
#include "modular_zubbers\code\modules\surgery\bodyparts\species_parts\misc_bodyparts.dm"
#include "modular_zubbers\code\modules\surgery\organs\internal\eyes\_eyes.dm"
#include "modular_zubbers\code\modules\surgery\organs\internal\lungs\_lungs.dm"
+#include "modular_zubbers\code\modules\synths\death_sound.dm"
+#include "modular_zubbers\code\modules\synths\code\synth_prefab.dm"
+#include "modular_zubbers\code\modules\synths\code\designs\exofab_designs.dm"
+#include "modular_zubbers\code\modules\title_screen\code\title_screen_subsystem.dm"
#include "modular_zubbers\code\modules\traitor\goal_overrides.dm"
#include "modular_zubbers\code\modules\uplink\uplink_items\bundle.dm"
#include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm"
#include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
#include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
+#include "modular_zubbers\code\modules\vending\comdrobe.dm"
#include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
+#include "modular_zubbers\code\modules\vending\megaseed.dm"
+#include "modular_zubbers\code\modules\vending\vending.dm"
+#include "modular_zubbers\code\modules\vending\wardrobe.dm"
+#include "modular_zubbers\code\modules\vetted\examine.dm"
+#include "modular_zubbers\code\modules\vetted\vetted.dm"
+#include "modular_zubbers\code\modules\vetted\overrides\erp_preferences.dm"
+#include "modular_zubbers\code\modules\voting\_votes.dm"
+#include "modular_zubbers\code\modules\voting\living_timer.dm"
+#include "modular_zubbers\code\modules\voting\vote_overrides.dm"
#include "modular_zubbers\code\modules\wizard_dize\wizard_dice_event.dm"
#include "modular_zubbers\code\modules\wizard_dize\wizard_dice_object.dm"
#include "modular_zubbers\code\modules\~donator\choicebeacon.dm"
@@ -8860,121 +8976,4 @@
#include "modular_zubbers\master_files\skyrat\modules\cortical_borer\code\cortical_borer_antag.dm"
#include "modular_zubbers\master_files\skyrat\modules\opposing_force\code\opposing_force_subsystem.dm"
#include "modular_zubbers\master_files\skyrat\modules\verbs\code\subtle.dm"
-#include "modular_zubbers\modules\antagonists\nightmare\nightmare_species.dm"
-#include "modular_zubbers\modules\arcades\assets\arcade.dm"
-#include "modular_zubbers\modules\arcades\code\loot\arcade_weights_classic.dm"
-#include "modular_zubbers\modules\arcades\code\loot\arcade_weights_mechanical.dm"
-#include "modular_zubbers\modules\arcades\code\loot\arcade_weights_oh_god.dm"
-#include "modular_zubbers\modules\arcades\code\loot\arcade_weights_special.dm"
-#include "modular_zubbers\modules\arcades\code\loot\arcade_weights_toy.dm"
-#include "modular_zubbers\modules\arcades\code\minesweeper\minesweeper.dm"
-#include "modular_zubbers\modules\arcades\code\overrides\spawners.dm"
-#include "modular_zubbers\modules\ashwalkers\code\effects\ash_rituals.dm"
-#include "modular_zubbers\modules\automapper\code\area_spawn_entries.dm"
-#include "modular_zubbers\modules\automapper\code\overrides\area_spawn_subsystem.dm"
-#include "modular_zubbers\modules\blooper\atoms_movable.dm"
-#include "modular_zubbers\modules\blooper\bark.dm"
-#include "modular_zubbers\modules\blooper\bark_list.dm"
-#include "modular_zubbers\modules\borgs\code\robot_defense.dm"
-#include "modular_zubbers\modules\borgs\code\robot_defines.dm"
-#include "modular_zubbers\modules\borgs\code\robot_items.dm"
-#include "modular_zubbers\modules\borgs\code\robot_model.dm"
-#include "modular_zubbers\modules\borgs\code\robot_upgrade.dm"
-#include "modular_zubbers\modules\bubber_tram\code\moonstation_tram.dm"
-#include "modular_zubbers\modules\client\code\chat_color.dm"
-#include "modular_zubbers\modules\client\code\preferences.dm"
-#include "modular_zubbers\modules\client\code\ssd.dm"
-#include "modular_zubbers\modules\client\flavor_text\flavor_text.dm"
-#include "modular_zubbers\modules\clothing\armor_overrides\hos_armor.dm"
-#include "modular_zubbers\modules\clothing\code\donator_clothing.dm"
-#include "modular_zubbers\modules\clothing\code\feet\clown.dm"
-#include "modular_zubbers\modules\clothing\code\gloves\clown.dm"
-#include "modular_zubbers\modules\clothing\code\head\helmet.dm"
-#include "modular_zubbers\modules\clothing\code\mask\clown.dm"
-#include "modular_zubbers\modules\clothing\code\sprite_accessories\sprite_accessories.dm"
-#include "modular_zubbers\modules\clothing\code\uniform\clown.dm"
-#include "modular_zubbers\modules\colony_fabricator\code\design_datums\fabricator_flag_additions\tools.dm"
-#include "modular_zubbers\modules\customization\modules\language\_language_holder.dm"
-#include "modular_zubbers\modules\customization\modules\language\common.dm"
-#include "modular_zubbers\modules\customization\modules\language\nekomimetic.dm"
-#include "modular_zubbers\modules\customization\modules\language\panslavic.dm"
-#include "modular_zubbers\modules\customization\modules\language\piratespeak.dm"
-#include "modular_zubbers\modules\customization\modules\language\siikmaas.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\taur_types.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\fluff.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\hair.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\horns.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\ipc.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\skrell_hair.dm"
-#include "modular_zubbers\modules\customization\modules\mob\dead\new_player\sprite_accessories\wings.dm"
-#include "modular_zubbers\modules\customization\modules\mob\living\carbon\human\species\akula.dm"
-#include "modular_zubbers\modules\customization\modules\mob\living\carbon\human\species\tajaran.dm"
-#include "modular_zubbers\modules\customization\modules\mob\living\carbon\human\species\xeno.dm"
-#include "modular_zubbers\modules\emotes\code\emotes.dm"
-#include "modular_zubbers\modules\emotes\code\synth_emotes.dm"
-#include "modular_zubbers\modules\ert_overrides\modified_equipement.dm"
-#include "modular_zubbers\modules\examine\examine_tgui.dm"
-#include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm"
-#include "modular_zubbers\modules\hacks\atmos\force_atmos.dm"
-#include "modular_zubbers\modules\hemophages\code\limbgrower.dm"
-#include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm"
-#include "modular_zubbers\modules\hydroponics\code\plantgenes\hydroponics.dm"
-#include "modular_zubbers\modules\hydroponics\code\vending\megaseed.dm"
-#include "modular_zubbers\modules\job_exempt\job_exempt.dm"
-#include "modular_zubbers\modules\jobs\code\job_types\quartermaster.dm"
-#include "modular_zubbers\modules\jobs\code\job_types\warden.dm"
-#include "modular_zubbers\modules\jobs\code\trims\jobs.dm"
-#include "modular_zubbers\modules\lunchbox\code\lunchbox.dm"
-#include "modular_zubbers\modules\mapping\modules\ss13_construct\areas.dm"
-#include "modular_zubbers\modules\mod_suits\modules.dm"
-#include "modular_zubbers\modules\modular_items\code\cake_light.dm"
-#include "modular_zubbers\modules\modular_items\code\idmaco_donator.dm"
-#include "modular_zubbers\modules\modular_items\code\necklace.dm"
-#include "modular_zubbers\modules\modular_items\code\recipes_misc.dm"
-#include "modular_zubbers\modules\modular_items\code\food_and_drinks\food\meatslab.dm"
-#include "modular_zubbers\modules\modular_weapons\code\gunsets.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\carwo.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\ammobox.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\carwo.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\saibasan\laser_guns.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\saibasan\mode_datums.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\saibasan\projectiles.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\magazines.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\pistol.dm"
-#include "modular_zubbers\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\ammo.dm"
-#include "modular_zubbers\modules\more_crushers\code\miningweapons.dm"
-#include "modular_zubbers\modules\normalized_syndie_clothing_4_tesh\unsorted_clothes.dm"
-#include "modular_zubbers\modules\pollution\code\perfumes.dm"
-#include "modular_zubbers\modules\pollution\code\pollutants_generic.dm"
-#include "modular_zubbers\modules\public_logging\public_logging.dm"
-#include "modular_zubbers\modules\quirks\code\_quirk.dm"
-#include "modular_zubbers\modules\quirks\code\negative_quirks\sensitive_snout.dm"
-#include "modular_zubbers\modules\quirks\code\negative_quirks\sol_weakness.dm"
-#include "modular_zubbers\modules\quirks\code\neutral_quirks\hungry.dm"
-#include "modular_zubbers\modules\quirks\code\neutral_quirks\waddle.dm"
-#include "modular_zubbers\modules\security\secmed\automapper.dm"
-#include "modular_zubbers\modules\security\secmed\secmed_clothes.dm"
-#include "modular_zubbers\modules\security\secmed\security_medic.dm"
-#include "modular_zubbers\modules\security_glock\ammo.dm"
-#include "modular_zubbers\modules\security_glock\cargo.dm"
-#include "modular_zubbers\modules\security_glock\case.dm"
-#include "modular_zubbers\modules\security_glock\firing_pin.dm"
-#include "modular_zubbers\modules\security_glock\gun.dm"
-#include "modular_zubbers\modules\security_glock\lockers.dm"
-#include "modular_zubbers\modules\security_glock\research.dm"
-#include "modular_zubbers\modules\shelves\shelf.dm"
-#include "modular_zubbers\modules\space_background\parallax.dm"
-#include "modular_zubbers\modules\space_background\turf_space.dm"
-#include "modular_zubbers\modules\synths\death_sound.dm"
-#include "modular_zubbers\modules\synths\code\synth_prefab.dm"
-#include "modular_zubbers\modules\synths\code\designs\exofab_designs.dm"
-#include "modular_zubbers\modules\title_screen\code\title_screen_subsystem.dm"
-#include "modular_zubbers\modules\vending\vending.dm"
-#include "modular_zubbers\modules\vending\wardrobe.dm"
-#include "modular_zubbers\modules\vetted\examine.dm"
-#include "modular_zubbers\modules\vetted\vetted.dm"
-#include "modular_zubbers\modules\vetted\overrides\erp_preferences.dm"
-#include "modular_zubbers\modules\voting\_votes.dm"
-#include "modular_zubbers\modules\voting\living_timer.dm"
-#include "modular_zubbers\modules\voting\vote_overrides.dm"
// END_INCLUDE