mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 17:41:50 +00:00
424ed3d160
This reverts commit e6bb4098c4.
# Conflicts:
# _maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
# _maps/RandomRuins/SpaceRuins/bus.dmm
# _maps/RandomZLevels/blackmesa.dmm
# _maps/map_files/generic/CentCom_skyrat_z2.dmm
# _maps/shuttles/skyrat/goldeneye_cruiser.dmm
# _maps/templates/lazy_templates/wizard_den.dmm
# code/__DEFINES/callbacks.dm
# code/datums/components/transforming.dm
# code/datums/elements/bane.dm
# code/datums/votes/map_vote.dm
# code/game/objects/items/AI_modules/hacked.dm
# code/game/objects/items/food/egg.dm
# code/game/objects/items/stacks/sheets/glass.dm
# code/modules/antagonists/fugitive/hunters/hunter.dm
# code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm
# code/modules/antagonists/traitor/objectives/kidnapping.dm
# code/modules/art/statues.dm
# code/modules/events/ghost_role/changeling_event.dm
# code/modules/events/spacevine.dm
# code/modules/mining/machine_redemption.dm
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# code/modules/mob_spawn/mob_spawn.dm
# code/modules/projectiles/guns/ballistic/pistol.dm
# code/modules/projectiles/guns/ballistic/rifle.dm
# code/modules/uplink/uplink_items.dm
# code/modules/vending/autodrobe.dm
# html/changelogs/archive/2023-03.yml
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/under/costume.dmi
# icons/mob/inhands/clothing/shoes_lefthand.dmi
# icons/mob/inhands/clothing/shoes_righthand.dmi
# icons/mob/inhands/clothing/suits_lefthand.dmi
# icons/mob/inhands/clothing/suits_righthand.dmi
# icons/mob/species/human/human_face.dmi
# icons/obj/clothing/shoes.dmi
# icons/obj/clothing/under/costume.dmi
# modular_skyrat/master_files/code/datums/components/fullauto.dm
# modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
# modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm
# modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi
# modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi
# modular_skyrat/modules/aesthetics/guns/code/guns.dm
# modular_skyrat/modules/aesthetics/guns/icons/guns.dmi
# modular_skyrat/modules/blueshield/code/blueshield.dm
# modular_skyrat/modules/customization/modules/clothing/under/misc.dm
# modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
# modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi
# modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm
# modular_skyrat/modules/manufacturer_examine/code/manufacturer_component.dm
# modular_skyrat/modules/mapping/code/mob_spawns.dm
# modular_skyrat/modules/modular_weapons/code/rifle.dm
# modular_skyrat/modules/novaya_ert/code/automatic.dm
# modular_skyrat/modules/sec_haul/code/guns/guns.dm
# modular_skyrat/modules/tribal_extended/code/weapons/bow.dm
# tgstation.dme
# tgui/packages/tgui/interfaces/OreRedemptionMachine.js
# tgui/packages/tgui/interfaces/VotePanel.tsx