mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
92833e335c
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this. # Conflicts: # code/datums/uplink/ammunition.dm # code/game/gamemodes/technomancer/spells/aura/fire_aura.dm # code/game/gamemodes/technomancer/spells/aura/frost_aura.dm # code/game/gamemodes/technomancer/spells/insert/mend_burns.dm # code/game/gamemodes/technomancer/spells/insert/mend_metal.dm # code/game/gamemodes/technomancer/spells/insert/mend_organs.dm # code/game/gamemodes/technomancer/spells/insert/mend_wires.dm # code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm # code/game/gamemodes/technomancer/spells/projectile/overload.dm # code/game/gamemodes/technomancer/spells/projectile/projectile.dm # code/game/jobs/job/captain.dm # code/game/jobs/job/science.dm # code/game/machinery/recharger.dm # code/game/machinery/suit_storage_unit.dm # code/game/objects/items/devices/flashlight.dm # code/game/objects/items/weapons/power_cells.dm # code/game/objects/items/weapons/stunbaton.dm # code/game/objects/structures/crates_lockers/closets/secure/security.dm # code/modules/client/preference_setup/loadout/loadout_shoes.dm # code/modules/client/preference_setup/loadout/loadout_uniform.dm # code/modules/client/preference_setup/loadout/loadout_xeno.dm # code/modules/clothing/spacesuits/void/station.dm # code/modules/integrated_electronics/assemblies.dm # code/modules/integrated_electronics/input_output.dm # code/modules/integrated_electronics/tools.dm # code/modules/mob/living/carbon/carbon_defense.dm # code/modules/mob/living/carbon/human/examine.dm # code/modules/mob/living/simple_animal/simple_animal.dm # code/modules/organs/blood.dm # code/modules/paperwork/faxmachine.dm # code/modules/projectiles/dnalocking.dm # code/modules/projectiles/effects.dm # code/modules/projectiles/guns/energy.dm # code/modules/projectiles/guns/energy/laser.dm # code/modules/projectiles/guns/energy/nuclear.dm # code/modules/projectiles/projectile/bullets.dm # code/modules/research/designs.dm # html/changelogs/.all_changelog.yml # html/changelogs/Anewbe - Beret.yml # html/changelogs/Anewbe - Tape Roll.yml # html/changelogs/MagmaRam-PR-2631.yml # html/changelogs/Redstryker - EMTVoidsuits.yml # icons/mob/head.dmi # icons/mob/items/lefthand_hats.dmi # icons/mob/items/lefthand_suits.dmi # icons/mob/items/righthand_hats.dmi # icons/mob/items/righthand_suits.dmi # icons/mob/species/seromi/head.dmi # icons/mob/species/seromi/suit.dmi # icons/mob/species/skrell/helmet.dmi # icons/mob/species/skrell/suit.dmi # icons/mob/species/tajaran/helmet.dmi # icons/mob/species/tajaran/suit.dmi # icons/mob/species/unathi/helmet.dmi # icons/mob/species/unathi/suit.dmi # icons/mob/suit.dmi # icons/obj/clothing/hats.dmi # icons/obj/clothing/species/seromi/hats.dmi # icons/obj/clothing/species/seromi/suits.dmi # icons/obj/clothing/species/skrell/hats.dmi # icons/obj/clothing/species/skrell/suits.dmi # icons/obj/clothing/species/tajaran/hats.dmi # icons/obj/clothing/species/tajaran/suits.dmi # icons/obj/clothing/species/unathi/hats.dmi # icons/obj/clothing/species/unathi/suits.dmi # icons/obj/clothing/suits.dmi # icons/obj/power.dmi # maps/RandomZLevels/stationCollision.dm # maps/polaris-1.dmm # maps/polaris-2.dmm