mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-06-26 00:25:30 +01:00
nevimer
99be7d565e
# Conflicts: # .github/CODEOWNERS # .github/CONTRIBUTING.md # .github/workflows/auto_changelog.yml # .github/workflows/compile_all_maps.yml # .github/workflows/compile_changelogs.yml # .github/workflows/gbp.yml # .github/workflows/gbp_collect.yml # .github/workflows/stale.yml # README.md # SQL/database_changelog.md # _maps/_basemap.dm # _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm # _maps/map_files/KiloStation/KiloStation.dmm # _maps/wawastation.json # code/__DEFINES/combat.dm # code/__DEFINES/icon_smoothing.dm # code/__DEFINES/inventory.dm # code/__DEFINES/mobs.dm # code/__DEFINES/subsystems.dm # code/__DEFINES/surgery.dm # code/__HELPERS/roundend.dm # code/_globalvars/bitfields.dm # code/_globalvars/lists/mobs.dm # code/_globalvars/traits/_traits.dm # code/_globalvars/traits/admin_tooling.dm # code/_onclick/hud/hud.dm # code/_onclick/hud/human.dm # code/_onclick/hud/screen_objects.dm # code/controllers/subsystem/processing/quirks.dm # code/controllers/subsystem/sprite_accessories.dm # code/controllers/subsystem/statpanel.dm # code/controllers/subsystem/ticker.dm # code/datums/brain_damage/creepy_trauma.dm # code/datums/browser.dm # code/datums/components/crafting/crafting.dm # code/datums/components/echolocation.dm # code/datums/components/leanable.dm # code/datums/dna/blocks/dna_features_block.dm # code/datums/dna/dna.dm # code/datums/emotes.dm # code/datums/map_config.dm # code/datums/mutations/_mutations.dm # code/datums/mutations/chameleon.dm # code/datums/quirks/negative_quirks/allergic.dm # code/datums/records/manifest.dm # code/datums/ruins/icemoon.dm # code/datums/station_traits/_station_trait.dm # code/datums/station_traits/job_traits.dm # code/datums/station_traits/neutral_traits.dm # code/datums/status_effects/debuffs/dna_transformation.dm # code/datums/storage/storage.dm # code/datums/storage/subtypes/bags.dm # code/datums/storage/subtypes/belts.dm # code/datums/storage/subtypes/others/misc.dm # code/datums/storage/subtypes/pockets.dm # code/datums/weather/weather.dm # code/datums/weather/weather_types/ash_storm.dm # code/game/data_huds.dm # code/game/gamemodes/objective.dm # code/game/machinery/computer/communications.dm # code/game/machinery/computer/dna_console.dm # code/game/machinery/computer/orders/order_computer/mining_order.dm # code/game/machinery/computer/records/medical.dm # code/game/machinery/dish_drive.dm # code/game/machinery/dna_infuser/organ_sets/fox_organs.dm # code/game/machinery/doors/airlock.dm # code/game/machinery/doors/firedoor.dm # code/game/machinery/requests_console.dm # code/game/objects/effects/decals/cleanable/blood.dm # code/game/objects/items/climbingrope.dm # code/game/objects/items/devices/scanners/health_analyzer.dm # code/game/objects/items/dualsaber.dm # code/game/objects/items/stacks/sheets/sheet_types.dm # code/game/objects/items/storage/backpack.dm # code/game/objects/items/storage/belt.dm # code/game/objects/items/storage/boxes/clothes_boxes.dm # code/game/objects/items/storage/dufflebags.dm # code/game/objects/items/storage/medkit.dm # code/game/objects/items/storage/toolboxes/weapons.dm # code/game/objects/items/surgery_tray.dm # code/game/objects/items/tools/painter/paintable_decals.dm # code/game/objects/structures/crates_lockers/closets/utility_closets.dm # code/game/objects/structures/girders.dm # code/game/objects/structures/kitchen_spike.dm # code/game/objects/structures/mirror.dm # code/game/objects/structures/tables_racks.dm # code/game/sound/sound.dm # code/game/world.dm # code/modules/admin/admin.dm # code/modules/admin/create_mob.dm # code/modules/admin/topic.dm # code/modules/admin/verbs/admingame.dm # code/modules/admin/verbs/ert.dm # code/modules/antagonists/brother/brother.dm # code/modules/antagonists/cult/cult_armor.dm # code/modules/antagonists/fugitive/hunters/hunter.dm # code/modules/antagonists/space_ninja/space_ninja.dm # code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm # code/modules/client/preferences.dm # code/modules/client/preferences/language.dm # code/modules/client/preferences/middleware/_middleware.dm # code/modules/client/preferences/species_features/moth.dm # code/modules/client/preferences/species_features/mushperson.dm # code/modules/client/preferences/species_features/pod.dm # code/modules/client/preferences_savefile.dm # code/modules/clothing/head/hat.dm # code/modules/clothing/shoes/boots.dm # code/modules/clothing/shoes/sneakers.dm # code/modules/clothing/suits/utility.dm # code/modules/clothing/under/color.dm # code/modules/clothing/under/jobs/security.dm # code/modules/escape_menu/leave_body.dm # code/modules/hydroponics/grown/replicapod.dm # code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm # code/modules/jobs/job_types/cyborg.dm # code/modules/loadout/categories/pocket.dm # code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm # code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm # code/modules/mob/dead/dead.dm # code/modules/mob/living/blood.dm # code/modules/mob/living/blood_types.dm # code/modules/mob/living/carbon/carbon.dm # code/modules/mob/living/carbon/examine.dm # code/modules/mob/living/carbon/human/_species.dm # code/modules/mob/living/carbon/human/dummy.dm # code/modules/mob/living/carbon/human/human.dm # code/modules/mob/living/carbon/human/human_defense.dm # code/modules/mob/living/carbon/human/human_update_icons.dm # code/modules/mob/living/carbon/human/inventory.dm # code/modules/mob/living/carbon/human/species_types/felinid.dm # code/modules/mob/living/carbon/human/species_types/mothmen.dm # code/modules/mob/living/carbon/human/species_types/mushpeople.dm # code/modules/mob/living/living.dm # code/modules/mob/living/living_item_handling.dm # code/modules/mob/living/silicon/ai/ai_say.dm # code/modules/mob/living/silicon/robot/examine.dm # code/modules/mob/living/silicon/robot/robot.dm # code/modules/mob/living/silicon/robot/robot_model.dm # code/modules/mob/mob_say.dm # code/modules/mod/mod_activation.dm # code/modules/mod/modules/_module.dm # code/modules/modular_computers/computers/item/computer.dm # code/modules/power/smes.dm # code/modules/projectiles/gun.dm # code/modules/reagents/chemistry/holder/mob_life.dm # code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm # code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm # code/modules/reagents/chemistry/reagents/medicine_reagents.dm # code/modules/religion/honorbound/honorbound_rites.dm # code/modules/shuttle/mobile_port/shuttle_move_callbacks.dm # code/modules/surgery/bodyparts/_bodyparts.dm # code/modules/surgery/bodyparts/head_hair_and_lips.dm # code/modules/surgery/organs/external/_visual_organs.dm # code/modules/surgery/organs/external/spines.dm # code/modules/surgery/organs/external/tails.dm # code/modules/surgery/organs/external/wings/moth_wings.dm # code/modules/surgery/organs/internal/ears/_ears.dm # code/modules/surgery/organs/internal/eyes/_eyes.dm # code/modules/surgery/surgery_step.dm # code/modules/tooltip/tooltip.html # code/modules/unit_tests/changeling.dm # code/modules/unit_tests/designs.dm # code/modules/unit_tests/screenshot_humanoids.dm # code/modules/unit_tests/screenshots/screenshot_airlocks_icons.png # code/modules/unit_tests/screenshots/screenshot_antag_icons_blobinfection.png # code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png # code/modules/unit_tests/screenshots/screenshot_antag_icons_obsessed.png # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human.png # code/modules/unit_tests/screenshots/screenshot_husk_body.png # code/modules/unit_tests/simple_animal_freeze.dm # code/modules/vending/medical.dm # code/modules/vending/sovietsoda.dm # config/dynamic.toml # config/maps.txt # config/spaceruinblacklist.txt # icons/map_icons/clothing/_clothing.dmi # icons/map_icons/clothing/head/_head.dmi # icons/map_icons/clothing/head/beret.dmi # icons/map_icons/clothing/mask.dmi # icons/map_icons/clothing/neck.dmi # icons/map_icons/clothing/shoes.dmi # icons/map_icons/clothing/suit/_suit.dmi # icons/map_icons/clothing/under/_under.dmi # icons/map_icons/clothing/under/costume.dmi # icons/map_icons/clothing/under/dress.dmi # icons/map_icons/items/_item.dmi # icons/map_icons/items/encryptionkey.dmi # icons/map_icons/items/pda.dmi # icons/map_icons/objects.dmi # interface/skin.dmf # modular_zubbers/code/modules/storyteller/event_defines/ghostset/alien_infestation.dm # modular_zubbers/code/modules/storyteller/event_defines/ghostset/changeling.dm # modular_zubbers/code/modules/storyteller/event_defines/ghostset/nightmare.dm # modular_zubbers/code/modules/storyteller/event_defines/ghostset/space_dragon.dm # modular_zubbers/code/modules/storyteller/event_defines/ghostset/space_ninja.dm # modular_zubbers/code/modules/storyteller/event_defines/ghostset/spider_infestation.dm # modular_zubbers/code/modules/storyteller/event_defines/major/abductor.dm # modular_zubbers/code/modules/storyteller/event_defines/major/blob.dm # modular_zubbers/code/modules/storyteller/event_defines/major/fugitives.dm # modular_zubbers/code/modules/storyteller/event_defines/major/morph.dm # modular_zubbers/code/modules/storyteller/event_defines/major/pirates.dm # modular_zubbers/code/modules/storyteller/event_defines/major/revenant.dm # modular_zubbers/code/modules/storyteller/event_defines/major/slaughter.dm # strings/pirates.json # strings/traumas.json # tgui/packages/tgfont/icons/nanotrasen_logo.svg # tgui/packages/tgfont/icons/syndicate_logo.svg # tgui/packages/tgui/index.tsx # tgui/packages/tgui/interfaces/AntagInfoBlob.tsx # tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx # tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx # tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx # tgui/packages/tgui/interfaces/PersonalCrafting/constants.ts # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/MainPage.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/QuirksPage.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/ItemDisplay.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/base.ts # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/loadout/index.tsx # tgui/packages/tgui/interfaces/Vending.tsx # tgui/packages/tgui/interfaces/VotePanel.tsx # tgui/packages/tgui/styles/interfaces/NtosMessenger.scss # tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss # tgui/packages/tgui/styles/main.scss # tools/ci/copy_build_output.sh # tools/maplint/lints/window_spawner.yml # tools/pull_request_hooks/autoChangelog.js