From 02acd7cba0d5803a9b07f6472ddaa46a30b34b63 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 19 Feb 2022 17:32:54 -0500 Subject: [PATCH 1/3] 8316 fix --- code/game/machinery/reagents/pump.dm | 270 -------- code/modules/reagents/machinery/pump.dm | 205 ++++++ icons/obj/machines/reagent.dmi | Bin 8928 -> 6662 bytes vorestation.dme | 860 ++++++++++++++++++++++++ 4 files changed, 1065 insertions(+), 270 deletions(-) delete mode 100644 code/game/machinery/reagents/pump.dm create mode 100644 code/modules/reagents/machinery/pump.dm diff --git a/code/game/machinery/reagents/pump.dm b/code/game/machinery/reagents/pump.dm deleted file mode 100644 index c48e8d9834..0000000000 --- a/code/game/machinery/reagents/pump.dm +++ /dev/null @@ -1,270 +0,0 @@ - -/obj/machinery/pump - name = "fluid pump" - desc = "A fluid pumping machine." - - description_info = "A machine that can pump fluid from certain turfs.
\ - Water can be pumped from any body of water. Certain locations or environmental\ - conditions can cause different byproducts to be produced.
\ - Magma or Lava can be pumped to produce mineralized fluid." - - anchored = FALSE - density = TRUE - - icon = 'icons/obj/machines/reagent.dmi' - icon_state = "pump" - - circuit = /obj/item/weapon/circuitboard/fluidpump - - var/on = 0 - var/obj/item/weapon/cell/cell = null - var/use = 200 - var/efficiency = 1 - var/reagents_per_cycle = 40 - var/unlocked = 0 - var/open = 0 - - var/obj/item/hose_connector/output/Output - -// Overlay cache vars. - var/icon/liquid - var/icon/tank - var/icon/powerlow - var/icon/glass - var/icon/open_overlay - var/icon/cell_overlay - -/obj/machinery/pump/Initialize() - create_reagents(200) - . = ..() - default_apply_parts() - - if(ispath(cell)) - cell = new cell(src) - - Output = new(src) - - RefreshParts() - update_icon() - -/obj/machinery/pump/update_icon() - ..() - if(!tank) - tank = new/icon(icon, "[icon_state]-volume") - - if(!powerlow) - powerlow = new/icon(icon, "[icon_state]-lowpower") - - if(!liquid) - var/icon/cutter = new/icon(icon, "[icon_state]-volume") - - cutter.Blend(rgb(0, 0, 0,), ICON_MULTIPLY) - - liquid = new/icon(icon, "[icon_state]-cutting") - - liquid.Blend(cutter,ICON_AND) - - if(!glass) - glass = new/icon(icon, "[icon_state]-glass") - - glass.Blend(rgb(1,1,1,0.5), ICON_MULTIPLY) - - if(!open_overlay) - open_overlay = new/icon(icon, "[icon_state]-open") - - if(!cell_overlay) - cell_overlay = new/icon(icon, "[icon_state]-cell") - - cut_overlays() - add_overlay(tank) - - if(cell && cell.charge < (use * CELLRATE / efficiency)) - add_overlay(powerlow) - - if(reagents.total_volume >= 1) - var/list/hextorgb = hex2rgb(reagents.get_color()) - liquid.GrayScale() - - liquid.Blend(rgb(hextorgb[1],hextorgb[2],hextorgb[3]),ICON_MULTIPLY) - - add_overlay(liquid) - - add_overlay(glass) - - if(open) - add_overlay(open_overlay) - - if(cell) - add_overlay(cell_overlay) - - if(on) - icon_state = "[initial(icon_state)]-running" - - else - icon_state = "[initial(icon_state)]" - -/obj/machinery/pump/process() - if(Output.get_pairing()) - reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume) - if(prob(5)) - visible_message("\The [src] gurgles as it exports fluid.") - - if(!on) - return - - if(!cell || (cell.charge < (use * CELLRATE / efficiency))) - turn_off(TRUE) - return - - handle_pumping() - update_icon() - -/obj/machinery/pump/RefreshParts() - for(var/obj/item/weapon/stock_parts/manipulator/SM in component_parts) - efficiency = SM.rating - - var/total_bin_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/SB in component_parts) - total_bin_rating += SB.rating - - reagents.maximum_volume = round(initial(reagents.maximum_volume) + 100 * total_bin_rating) - - return - -/obj/machinery/pump/power_change() - if(!cell || cell.charge < (use * CELLRATE) || !anchored) - return turn_off(TRUE) - - return FALSE - - -// Returns 0 on failure and 1 on success -/obj/machinery/pump/proc/turn_on(var/loud = 0) - if(!cell) - return 0 - if(cell.charge < (use * CELLRATE)) - return 0 - - on = 1 - update_icon() - if(loud) - visible_message("\The [src] turns on.") - return 1 - -/obj/machinery/pump/proc/turn_off(var/loud = 0) - on = 0 - set_light(0, 0) - update_icon() - if(loud) - visible_message("\The [src] shuts down.") - - if(!on) - return TRUE - - return FALSE - -/obj/machinery/pump/attack_ai(mob/user as mob) - if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) - return attack_hand(user) - - if(on) - turn_off(TRUE) - else - if(!turn_on(1)) - to_chat(user, "You try to turn on \the [src] but it does not work.") - -/obj/machinery/pump/attack_hand(mob/user as mob) - if(open && cell) - if(ishuman(user)) - if(!user.get_active_hand()) - user.put_in_hands(cell) - cell.loc = user.loc - else - cell.loc = src.loc - - cell.add_fingerprint(user) - cell.update_icon() - - cell = null - on = 0 - set_light(0) - to_chat(user, "You remove the power cell.") - update_icon() - return - - if(on) - turn_off(TRUE) - else if(anchored) - if(!turn_on(1)) - to_chat(user, "You try to turn on \the [src] but it does not work.") - - update_icon() - -/obj/machinery/pump/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(W.is_screwdriver()) - if(!open) - if(unlocked) - unlocked = 0 - to_chat(user, "You screw the battery panel in place.") - else - unlocked = 1 - to_chat(user, "You unscrew the battery panel.") - - else if(W.is_crowbar()) - if(unlocked) - if(open) - open = 0 - overlays = null - to_chat(user, "You crowbar the battery panel in place.") - else - if(unlocked) - open = 1 - to_chat(user, "You remove the battery panel.") - - else if(W.is_wrench()) - if(on) - to_chat(user, "\The [src] is active. Turn it off before trying to move it!") - return - default_unfasten_wrench(user, W, 2 SECONDS) - - else if(istype(W, /obj/item/weapon/cell)) - if(open) - if(cell) - to_chat(user, "There is a power cell already installed.") - else - user.drop_item() - W.loc = src - cell = W - to_chat(user, "You insert the power cell.") - else - ..() - RefreshParts() - update_icon() - -/obj/machinery/pump/proc/handle_pumping() - var/turf/T = get_turf(src) - - if(istype(T, /turf/simulated/floor/water)) - cell.use(use * CELLRATE / efficiency) - reagents.add_reagent("water", reagents_per_cycle) - - if(T.temperature <= T0C) - reagents.add_reagent("ice", round(reagents_per_cycle / 2, 0.1)) - - if((istype(T,/turf/simulated/floor/water/pool) || istype(T,/turf/simulated/floor/water/deep/pool))) - reagents.add_reagent("chlorine", round(reagents_per_cycle / 10 * efficiency, 0.1)) - - else if(istype(T,/turf/simulated/floor/water/contaminated)) - reagents.add_reagent("vatstabilizer", round(reagents_per_cycle / 2)) - - if(T.loc.name == "Sea") // Saltwater. - reagents.add_reagent("sodiumchloride", round(reagents_per_cycle / 10 * efficiency, 0.1)) - - for(var/turf/simulated/mineral/MT in range(5)) - if(MT.mineral) - var/obj/effect/mineral/OR = MT.mineral - reagents.add_reagent(OR.ore_reagent, round(reagents_per_cycle / 20 * efficiency, 0.1)) - - else if(istype(T, /turf/simulated/floor/lava)) - cell.use(use * CELLRATE / efficiency * 4) - reagents.add_reagent("mineralizedfluid", round(reagents_per_cycle * efficiency / 2, 0.1)) diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm new file mode 100644 index 0000000000..6c9302d61e --- /dev/null +++ b/code/modules/reagents/machinery/pump.dm @@ -0,0 +1,205 @@ +/obj/machinery/pump + name = "fluid pump" + desc = "A fluid pumping machine." + + description_info = "A machine that can pump fluid from certain turfs.
\ + Water can be pumped from any body of water. Certain locations or environmental\ + conditions can cause different byproducts to be produced.
\ + Magma or Lava can be pumped to produce mineralized fluid." + + anchored = 0 + density = 1 + + icon = 'icons/obj/machines/reagent.dmi' + icon_state = "pump" + + circuit = /obj/item/weapon/circuitboard/fluidpump + active_power_usage = 200 * CELLRATE + + var/obj/item/weapon/cell/cell = null + var/obj/item/hose_connector/output/Output = null + var/reagents_per_cycle = 40 + var/on = 0 + var/unlocked = 0 + var/open = 0 + +/obj/machinery/pump/Initialize() + create_reagents(200) + . = ..() + default_apply_parts() + cell = default_use_hicell() + + Output = new(src) + + RefreshParts() + update_icon() + +/obj/machinery/pump/Destroy() + QDEL_NULL(cell) + QDEL_NULL(Output) + . = ..() + +/obj/machinery/pump/RefreshParts() + var/obj/item/weapon/stock_parts/manipulator/SM = locate() in component_parts + active_power_usage = initial(active_power_usage) / SM.rating + + var/motor_power = 0 + for(var/obj/item/weapon/stock_parts/motor/M in component_parts) + motor_power += M.rating + reagents_per_cycle = initial(reagents_per_cycle) * motor_power / 2 + + var/bin_size = 0 + for(var/obj/item/weapon/stock_parts/matter_bin/SB in component_parts) + bin_size += SB.rating + + // New holder might have different volume. Transfer everything to a new holder to account for this. + var/datum/reagents/R = new(round(initial(reagents.maximum_volume) + 100 * bin_size), src) + src.reagents.trans_to_holder(R, src.reagents.total_volume) + qdel(src.reagents) + src.reagents = R + +/obj/machinery/pump/update_icon() + ..() + cut_overlays() + add_overlay("[icon_state]-tank") + if(!(cell?.check_charge(active_power_usage))) + add_overlay("[icon_state]-lowpower") + + if(reagents.total_volume >= 1) + var/image/I = image(icon, "[icon_state]-volume") + I.color = reagents.get_color() + add_overlay(I) + add_overlay("[icon_state]-glass") + + if(open) + add_overlay("[icon_state]-open") + if(istype(cell)) + add_overlay("[icon_state]-cell") + + icon_state = "[initial(icon_state)][on ? "-running" : ""]" + +/obj/machinery/pump/process() + if(!on) + return + + if(!anchored || !(cell?.use(active_power_usage))) + set_state(FALSE) + return + + var/turf/T = get_turf(src) + if(!istype(T)) + return + T.pump_reagents(reagents, reagents_per_cycle) + update_icon() + + if(Output.get_pairing()) + reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume) + if(prob(5)) + visible_message("\The [src] gurgles as it pumps fluid.") + + +// Sets the power state, if possible. +// Returns TRUE/FALSE on power state changing +// var/target = target power state +// var/message = TRUE/FALSE whether to make a message about state change +/obj/machinery/pump/proc/set_state(var/target, var/message = TRUE) + if(target == on) + return FALSE + + if(!on && (!(cell?.check_charge(active_power_usage)) || !anchored)) + return FALSE + + on = !on + update_icon() + if(message) + if(on) + message = SPAN_NOTICE("\The [src] turns on.") + else + message = SPAN_NOTICE("\The [src] shuts down.") + visible_message(message) + return TRUE + +/obj/machinery/pump/attack_robot(mob/user) + return attack_hand(user) + +/obj/machinery/pump/attack_ai(mob/user) + if(!set_state(!on)) + to_chat(user, "You try to toggle \the [src] but it does not respond.") + +/obj/machinery/pump/attack_hand(mob/user) + if(open && istype(cell)) + user.put_in_hands(cell) + cell.add_fingerprint(user) + cell.update_icon() + cell = null + set_state(FALSE) + to_chat(user, "You remove the power cell.") + return + + if(!set_state(!on)) + to_chat(user, "You try to toggle \the [src] but it does not respond.") + +/obj/machinery/pump/attackby(obj/item/weapon/W, mob/user) + . = TRUE + if(W.is_screwdriver() && !open) + to_chat(user, SPAN_NOTICE("You [unlocked ? "screw" : "unscrew"] the battery panel.")) + unlocked = !unlocked + + else if(W.is_crowbar() && unlocked) + to_chat(user, open ? \ + "You crowbar the battery panel in place." : \ + "You remove the battery panel." \ + ) + open = !open + + else if(W.is_wrench()) + if(on) + to_chat(user, "\The [src] is active. Turn it off before trying to move it!") + return FALSE + default_unfasten_wrench(user, W, 2 SECONDS) + + else if(istype(W, /obj/item/weapon/cell) && open) + if(istype(cell)) + to_chat(user, "There is a power cell already installed.") + return FALSE + user.drop_from_inventory(W, src) + to_chat(user, "You insert the power cell.") + + else + . = ..() + + RefreshParts() + update_icon() + + +/turf/proc/pump_reagents() + return + +/turf/simulated/floor/lava/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("mineralizedfluid", round(volume / 2, 0.1)) + + +/turf/simulated/floor/water/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("water", round(volume, 0.1)) + + if(temperature <= T0C) + R.add_reagent("ice", round(volume / 2, 0.1)) + + for(var/turf/simulated/mineral/M in orange(5)) + if(istype(M.mineral, /obj/effect/mineral)) + var/obj/effect/mineral/ore = M.mineral + reagents.add_reagent(ore.ore_reagent, round(volume / 2, 0.1)) + +/turf/simulated/floor/water/pool/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("chlorine", round(volume / 10, 0.1)) + +/turf/simulated/floor/water/deep/pool/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("chlorine", round(volume / 10, 0.1)) + +/turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) \ No newline at end of file diff --git a/icons/obj/machines/reagent.dmi b/icons/obj/machines/reagent.dmi index 7495451380140bc952cf64701d5480f8a84f02d8..7a284942bc945dcf1652c1bf487394cd338ac452 100644 GIT binary patch literal 6662 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 TNn+stJAm3lO{G!=i;({Upoje) literal 8928 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 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\hub.dm" #include "code\names.dm" #include "code\stylesheet.dm" #include "code\world.dm" #include "code\__datastructures\globals.dm" #include "code\__defines\__513_compatibility.dm" +<<<<<<< HEAD +======= +#include "code\__defines\__outdated_compatibility.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\_compile_options.dm" #include "code\__defines\_lists.dm" #include "code\__defines\_planes+layers.dm" @@ -36,7 +45,10 @@ #include "code\__defines\admin_vr.dm" #include "code\__defines\appearance.dm" #include "code\__defines\atmos.dm" +<<<<<<< HEAD #include "code\__defines\belly_modes_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\belly_modes_vr.dm" #include "code\__defines\callbacks.dm" #include "code\__defines\chemistry.dm" @@ -66,11 +78,17 @@ #include "code\__defines\math_physics.dm" #include "code\__defines\MC.dm" #include "code\__defines\misc.dm" +<<<<<<< HEAD #include "code\__defines\misc_ch.dm" #include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" #include "code\__defines\mobs_vr.dm" #include "code\__defines\mobs_yw.dm" +======= +#include "code\__defines\misc_vr.dm" +#include "code\__defines\mobs.dm" +#include "code\__defines\mobs_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\nifsoft.dm" #include "code\__defines\objects.dm" #include "code\__defines\overmap.dm" @@ -90,7 +108,10 @@ #include "code\__defines\spaceman_dmm.dm" #include "code\__defines\species_languages.dm" #include "code\__defines\species_languages_vr.dm" +<<<<<<< HEAD #include "code\__defines\species_languages_YW.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\sprite_sheets.dm" #include "code\__defines\sqlite_defines.dm" #include "code\__defines\stat_tracking.dm" @@ -131,7 +152,10 @@ #include "code\_helpers\files.dm" #include "code\_helpers\game.dm" #include "code\_helpers\global_lists.dm" +<<<<<<< HEAD #include "code\_helpers\global_lists_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_helpers\global_lists_vr.dm" #include "code\_helpers\icons.dm" #include "code\_helpers\icons_vr.dm" @@ -148,12 +172,18 @@ #include "code\_helpers\time.dm" #include "code\_helpers\turfs.dm" #include "code\_helpers\type2type.dm" +<<<<<<< HEAD #include "code\_helpers\typelists.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_helpers\unsorted.dm" #include "code\_helpers\unsorted_vr.dm" #include "code\_helpers\view.dm" #include "code\_helpers\visual_filters.dm" +<<<<<<< HEAD #include "code\_helpers\widelists_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_helpers\sorts\__main.dm" #include "code\_helpers\sorts\comparators.dm" #include "code\_helpers\sorts\TimSort.dm" @@ -194,7 +224,10 @@ #include "code\_onclick\hud\robot_vr.dm" #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screen_objects_vr.dm" +<<<<<<< HEAD #include "code\_onclick\hud\screen_objects_zz_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_onclick\hud\skybox.dm" #include "code\_onclick\hud\soulcatcher_guest.dm" #include "code\_onclick\hud\spell_screen_objects.dm" @@ -226,7 +259,10 @@ #include "code\ATMOSPHERICS\components\unary\cold_sink.dm" #include "code\ATMOSPHERICS\components\unary\heat_exchanger.dm" #include "code\ATMOSPHERICS\components\unary\heat_source.dm" +<<<<<<< HEAD #include "code\ATMOSPHERICS\components\unary\heat_source_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\ATMOSPHERICS\components\unary\outlet_injector.dm" #include "code\ATMOSPHERICS\components\unary\unary_base.dm" #include "code\ATMOSPHERICS\components\unary\vent_pump.dm" @@ -247,7 +283,10 @@ #include "code\controllers\autotransfer.dm" #include "code\controllers\communications.dm" #include "code\controllers\configuration.dm" +<<<<<<< HEAD #include "code\controllers\configuration_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\configuration_vr.dm" #include "code\controllers\controller.dm" #include "code\controllers\emergency_shuttle_controller.dm" @@ -271,9 +310,13 @@ #include "code\controllers\subsystems\chat.dm" #include "code\controllers\subsystems\chemistry.dm" #include "code\controllers\subsystems\circuits.dm" +<<<<<<< HEAD #include "code\controllers\subsystems\dbcore.dm" #include "code\controllers\subsystems\dcs.dm" #include "code\controllers\subsystems\discord.dm" +======= +#include "code\controllers\subsystems\dcs.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\subsystems\events.dm" #include "code\controllers\subsystems\garbage.dm" #include "code\controllers\subsystems\holomaps.dm" @@ -285,7 +328,10 @@ #include "code\controllers\subsystems\mapping.dm" #include "code\controllers\subsystems\media_tracks.dm" #include "code\controllers\subsystems\mobs.dm" +<<<<<<< HEAD #include "code\controllers\subsystems\nanoui.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\subsystems\nightshift.dm" #include "code\controllers\subsystems\orbits.dm" #include "code\controllers\subsystems\overlays.dm" @@ -294,7 +340,10 @@ #include "code\controllers\subsystems\planets.dm" #include "code\controllers\subsystems\plants.dm" #include "code\controllers\subsystems\radiation.dm" +<<<<<<< HEAD #include "code\controllers\subsystems\reflect_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\subsystems\shuttles.dm" #include "code\controllers\subsystems\skybox.dm" #include "code\controllers\subsystems\sounds.dm" @@ -321,7 +370,10 @@ #include "code\datums\ai_law_sets.dm" #include "code\datums\ai_law_sets_vr.dm" #include "code\datums\ai_laws.dm" +<<<<<<< HEAD #include "code\datums\api.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\beam.dm" #include "code\datums\browser.dm" #include "code\datums\callback.dm" @@ -335,6 +387,10 @@ #include "code\datums\ghost_query_vr.dm" #include "code\datums\hierarchy.dm" #include "code\datums\mind.dm" +<<<<<<< HEAD +======= +#include "code\datums\mind_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\mixed.dm" #include "code\datums\modules.dm" #include "code\datums\mutable_appearance.dm" @@ -349,7 +405,10 @@ #include "code\datums\weakref.dm" #include "code\datums\autolathe\arms.dm" #include "code\datums\autolathe\arms_vr.dm" +<<<<<<< HEAD #include "code\datums\autolathe\arms_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\autolathe\autolathe.dm" #include "code\datums\autolathe\devices.dm" #include "code\datums\autolathe\devices_vr.dm" @@ -443,7 +502,10 @@ #include "code\datums\outfits\jobs\science.dm" #include "code\datums\outfits\jobs\science_vr.dm" #include "code\datums\outfits\jobs\security.dm" +<<<<<<< HEAD #include "code\datums\outfits\jobs\security_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\outfits\jobs\special_vr.dm" #include "code\datums\outfits\military\fleet.dm" #include "code\datums\outfits\military\marines.dm" @@ -470,9 +532,13 @@ #include "code\datums\supplypacks\hydroponics.dm" #include "code\datums\supplypacks\hydroponics_vr.dm" #include "code\datums\supplypacks\materials.dm" +<<<<<<< HEAD #include "code\datums\supplypacks\materials_yw.dm" #include "code\datums\supplypacks\medical.dm" #include "code\datums\supplypacks\medical_ch.dm" +======= +#include "code\datums\supplypacks\medical.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\supplypacks\medical_vr.dm" #include "code\datums\supplypacks\misc.dm" #include "code\datums\supplypacks\misc_vr.dm" @@ -481,14 +547,20 @@ #include "code\datums\supplypacks\musical.dm" #include "code\datums\supplypacks\recreation.dm" #include "code\datums\supplypacks\recreation_vr.dm" +<<<<<<< HEAD #include "code\datums\supplypacks\recreation_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\supplypacks\robotics.dm" #include "code\datums\supplypacks\robotics_vr.dm" #include "code\datums\supplypacks\science.dm" #include "code\datums\supplypacks\science_vr.dm" #include "code\datums\supplypacks\security.dm" #include "code\datums\supplypacks\security_vr.dm" +<<<<<<< HEAD #include "code\datums\supplypacks\security_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\supplypacks\supply.dm" #include "code\datums\supplypacks\supply_vr.dm" #include "code\datums\supplypacks\supplypacks.dm" @@ -548,6 +620,10 @@ #include "code\defines\obj\weapon.dm" #include "code\defines\procs\announce.dm" #include "code\defines\procs\AStar.dm" +<<<<<<< HEAD +======= +#include "code\defines\procs\dbcore.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\defines\procs\radio.dm" #include "code\defines\procs\statistics.dm" #include "code\game\atoms.dm" @@ -600,17 +676,26 @@ #include "code\game\antagonist\station\traitor.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" +<<<<<<< HEAD #include "code\game\area\areas_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\area\areas_vr.dm" #include "code\game\area\asteroid_areas.dm" #include "code\game\area\Away Mission areas.dm" #include "code\game\area\CC_areas_vr.dm" #include "code\game\area\Space Station 13 areas.dm" +<<<<<<< HEAD #include "code\game\area\Space Station 13 areas_ch.dm" #include "code\game\area\Space Station 13 areas_vr.dm" #include "code\game\area\ss13_deprecated_areas.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_ch.dm" +======= +#include "code\game\area\Space Station 13 areas_vr.dm" +#include "code\game\area\ss13_deprecated_areas.dm" +#include "code\game\dna\dna2.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\dna\dna2_domutcheck.dm" #include "code\game\dna\dna2_helpers.dm" #include "code\game\dna\dna_modifier.dm" @@ -722,7 +807,10 @@ #include "code\game\gamemodes\technomancer\clothing.dm" #include "code\game\gamemodes\technomancer\core_obj.dm" #include "code\game\gamemodes\technomancer\equipment.dm" +<<<<<<< HEAD #include "code\game\gamemodes\technomancer\equipment_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\gamemodes\technomancer\instability.dm" #include "code\game\gamemodes\technomancer\spell_objs.dm" #include "code\game\gamemodes\technomancer\spell_objs_helpers.dm" @@ -817,7 +905,10 @@ #include "code\game\jobs\job\job.dm" #include "code\game\jobs\job\job_vr.dm" #include "code\game\jobs\job\medical.dm" +<<<<<<< HEAD #include "code\game\jobs\job\medical_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\jobs\job\medical_vr.dm" #include "code\game\jobs\job\offduty_vr.dm" #include "code\game\jobs\job\science.dm" @@ -827,13 +918,19 @@ #include "code\game\jobs\job\silicon.dm" #include "code\game\jobs\job\silicon_vr.dm" #include "code\game\jobs\job\special_vr.dm" +<<<<<<< HEAD #include "code\game\jobs\job\zz_alt_titles_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\adv_med.dm" #include "code\game\machinery\adv_med_vr.dm" #include "code\game\machinery\ai_slipper.dm" #include "code\game\machinery\air_alarm.dm" #include "code\game\machinery\airconditioner_vr.dm" +<<<<<<< HEAD #include "code\game\machinery\airconditioner_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\atm_ret_field.dm" #include "code\game\machinery\atmo_control.dm" #include "code\game\machinery\autolathe.dm" @@ -844,9 +941,14 @@ #include "code\game\machinery\buttons.dm" #include "code\game\machinery\buttons_vr.dm" #include "code\game\machinery\CableLayer.dm" +<<<<<<< HEAD #include "code\game\machinery\casino_ch.dm" #include "code\game\machinery\casino_prize_dispenser_ch.dm" #include "code\game\machinery\cell_charger.dm" +======= +#include "code\game\machinery\cell_charger.dm" +#include "code\game\machinery\clawmachine.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\cloning.dm" #include "code\game\machinery\cryo.dm" #include "code\game\machinery\cryopod.dm" @@ -857,7 +959,10 @@ #include "code\game\machinery\doorbell_vr.dm" #include "code\game\machinery\doppler_array.dm" #include "code\game\machinery\exonet_node.dm" +<<<<<<< HEAD #include "code\game\machinery\feeder.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\fire_alarm.dm" #include "code\game\machinery\flasher.dm" #include "code\game\machinery\floodlight.dm" @@ -871,7 +976,10 @@ #include "code\game\machinery\igniter.dm" #include "code\game\machinery\iv_drip.dm" #include "code\game\machinery\jukebox.dm" +<<<<<<< HEAD #include "code\game\machinery\jukebox_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\lightswitch.dm" #include "code\game\machinery\machinery.dm" #include "code\game\machinery\machinery_power.dm" @@ -904,16 +1012,25 @@ #include "code\game\machinery\suit_cycler_datums.dm" #include "code\game\machinery\suit_storage_unit.dm" #include "code\game\machinery\suit_storage_unit_vr.dm" +<<<<<<< HEAD #include "code\game\machinery\suit_storage_unit_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\supply_display.dm" #include "code\game\machinery\supplybeacon.dm" #include "code\game\machinery\syndicatebeacon.dm" #include "code\game\machinery\syndicatebeacon_vr.dm" +<<<<<<< HEAD #include "code\game\machinery\telecrystal_storage_ch.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transportpod.dm" #include "code\game\machinery\turret_control.dm" #include "code\game\machinery\vending_yw.dm" +======= +#include "code\game\machinery\teleporter.dm" +#include "code\game\machinery\transportpod.dm" +#include "code\game\machinery\turret_control.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\vitals_monitor.dm" #include "code\game\machinery\wall_frames.dm" #include "code\game\machinery\washing_machine.dm" @@ -970,20 +1087,29 @@ #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_angled_bay.dm" #include "code\game\machinery\doors\airlock_angled_tgmc.dm" +<<<<<<< HEAD #include "code\game\machinery\doors\airlock_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\doors\airlock_control.dm" #include "code\game\machinery\doors\airlock_electronics.dm" #include "code\game\machinery\doors\airlock_vr.dm" #include "code\game\machinery\doors\alarmlock.dm" #include "code\game\machinery\doors\blast_door.dm" +<<<<<<< HEAD #include "code\game\machinery\doors\blast_door_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\doors\brigdoors.dm" #include "code\game\machinery\doors\checkForMultipleDoors.dm" #include "code\game\machinery\doors\door.dm" #include "code\game\machinery\doors\door_vr.dm" #include "code\game\machinery\doors\firedoor.dm" #include "code\game\machinery\doors\firedoor_assembly.dm" +<<<<<<< HEAD #include "code\game\machinery\doors\firedoor_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\doors\firedoor_vr.dm" #include "code\game\machinery\doors\multi_tile.dm" #include "code\game\machinery\doors\multi_tile_vr.dm" @@ -999,12 +1125,16 @@ #include "code\game\machinery\embedded_controller\embedded_program_base.dm" #include "code\game\machinery\embedded_controller\mapping_helpers.dm" #include "code\game\machinery\embedded_controller\simple_docking_controller.dm" +<<<<<<< HEAD #include "code\game\machinery\event\christmas_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\event\stage_vr.dm" #include "code\game\machinery\pipe\construction.dm" #include "code\game\machinery\pipe\pipe_dispenser.dm" #include "code\game\machinery\pipe\pipe_recipes.dm" #include "code\game\machinery\pipe\pipelayer.dm" +<<<<<<< HEAD #include "code\game\machinery\reagents\pump.dm" #include "code\game\machinery\telecomms\broadcaster.dm" #include "code\game\machinery\telecomms\broadcaster_ch.dm" @@ -1012,6 +1142,13 @@ #include "code\game\machinery\telecomms\machine_interactions.dm" #include "code\game\machinery\telecomms\presets.dm" #include "code\game\machinery\telecomms\presets_ch.dm" +======= +#include "code\game\machinery\telecomms\broadcaster.dm" +#include "code\game\machinery\telecomms\broadcaster_vr.dm" +#include "code\game\machinery\telecomms\logbrowser.dm" +#include "code\game\machinery\telecomms\machine_interactions.dm" +#include "code\game\machinery\telecomms\presets.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\telecomms\presets_vr.dm" #include "code\game\machinery\telecomms\telecomunications.dm" #include "code\game\machinery\telecomms\telemonitor.dm" @@ -1027,6 +1164,7 @@ #include "code\game\mecha\mecha_actions.dm" #include "code\game\mecha\mecha_appearance.dm" #include "code\game\mecha\mecha_construction_paths.dm" +<<<<<<< HEAD #include "code\game\mecha\mecha_construction_paths_ch.dm" #include "code\game\mecha\mecha_control_console.dm" #include "code\game\mecha\mecha_helpers.dm" @@ -1035,6 +1173,13 @@ #include "code\game\mecha\mecha_vr.dm" #include "code\game\mecha\mecha_wreckage.dm" #include "code\game\mecha\mecha_wreckage_ch.dm" +======= +#include "code\game\mecha\mecha_control_console.dm" +#include "code\game\mecha\mecha_helpers.dm" +#include "code\game\mecha\mecha_parts.dm" +#include "code\game\mecha\mecha_vr.dm" +#include "code\game\mecha\mecha_wreckage.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\mecha\combat\combat.dm" #include "code\game\mecha\combat\durand.dm" #include "code\game\mecha\combat\fighter.dm" @@ -1042,7 +1187,10 @@ #include "code\game\mecha\combat\gygax.dm" #include "code\game\mecha\combat\marauder.dm" #include "code\game\mecha\combat\phazon.dm" +<<<<<<< HEAD #include "code\game\mecha\combat\scarab_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\mecha\components\_component.dm" #include "code\game\mecha\components\actuators.dm" #include "code\game\mecha\components\armor.dm" @@ -1067,7 +1215,10 @@ #include "code\game\mecha\equipment\tools\medigun_vr.dm" #include "code\game\mecha\equipment\tools\orescanner.dm" #include "code\game\mecha\equipment\tools\passenger.dm" +<<<<<<< HEAD #include "code\game\mecha\equipment\tools\phoron_bore_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\mecha\equipment\tools\powertool.dm" #include "code\game\mecha\equipment\tools\rcd.dm" #include "code\game\mecha\equipment\tools\repair_droid.dm" @@ -1122,19 +1273,28 @@ #include "code\game\objects\explosion.dm" #include "code\game\objects\explosion_recursive.dm" #include "code\game\objects\items.dm" +<<<<<<< HEAD #include "code\game\objects\kasscbuttons_ch.dm" #include "code\game\objects\mob_spawner_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\mob_spawner_vr.dm" #include "code\game\objects\objs.dm" #include "code\game\objects\structures.dm" #include "code\game\objects\stumble_into_vr.dm" #include "code\game\objects\weapons.dm" +<<<<<<< HEAD #include "code\game\objects\effects\blockers_yw.dm" #include "code\game\objects\effects\bluespace_spawner_ch.dm" #include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\confetti_vr.dm" #include "code\game\objects\effects\effect_system.dm" #include "code\game\objects\effects\effect_system_ch.dm" +======= +#include "code\game\objects\effects\bump_teleporter.dm" +#include "code\game\objects\effects\confetti_vr.dm" +#include "code\game\objects\effects\effect_system.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\effects\explosion_particles.dm" #include "code\game\objects\effects\gibs.dm" #include "code\game\objects\effects\glowshroom.dm" @@ -1152,8 +1312,11 @@ #include "code\game\objects\effects\spiders_vr.dm" #include "code\game\objects\effects\step_triggers.dm" #include "code\game\objects\effects\zone_divider.dm" +<<<<<<< HEAD #include "code\game\objects\effects\zz_portals_ch.dm" #include "code\game\objects\effects\zz_triggers_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\effects\alien\aliens.dm" #include "code\game\objects\effects\chem\chemsmoke.dm" #include "code\game\objects\effects\chem\coating.dm" @@ -1169,7 +1332,10 @@ #include "code\game\objects\effects\decals\Cleanable\fuel.dm" #include "code\game\objects\effects\decals\Cleanable\humans.dm" #include "code\game\objects\effects\decals\Cleanable\misc.dm" +<<<<<<< HEAD #include "code\game\objects\effects\decals\Cleanable\reagent_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\effects\decals\Cleanable\robots.dm" #include "code\game\objects\effects\decals\Cleanable\tracks.dm" #include "code\game\objects\effects\decals\posters\bs12.dm" @@ -1215,9 +1381,13 @@ #include "code\game\objects\items\pizza_voucher_vr.dm" #include "code\game\objects\items\poi_items.dm" #include "code\game\objects\items\robobag.dm" +<<<<<<< HEAD #include "code\game\objects\items\sahoc_ch.dm" #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\surplus_voucher_ch.dm" +======= +#include "code\game\objects\items\shooting_range.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\tailoring.dm" #include "code\game\objects\items\trash.dm" #include "code\game\objects\items\trash_material.dm" @@ -1246,13 +1416,19 @@ #include "code\game\objects\items\devices\modkit.dm" #include "code\game\objects\items\devices\multitool.dm" #include "code\game\objects\items\devices\paicard.dm" +<<<<<<< HEAD #include "code\game\objects\items\devices\paicard_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\pipe_painter.dm" #include "code\game\objects\items\devices\powersink.dm" #include "code\game\objects\items\devices\scanners.dm" #include "code\game\objects\items\devices\scanners_vr.dm" #include "code\game\objects\items\devices\spy_bug.dm" +<<<<<<< HEAD #include "code\game\objects\items\devices\starcaster_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\suit_cooling.dm" #include "code\game\objects\items\devices\t_scanner.dm" #include "code\game\objects\items\devices\taperecorder.dm" @@ -1265,7 +1441,10 @@ #include "code\game\objects\items\devices\uplink.dm" #include "code\game\objects\items\devices\uplink_random_lists.dm" #include "code\game\objects\items\devices\whistle.dm" +<<<<<<< HEAD #include "code\game\objects\items\devices\communicator\cartridge.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\communicator\communicator.dm" #include "code\game\objects\items\devices\communicator\helper.dm" #include "code\game\objects\items\devices\communicator\integrated.dm" @@ -1277,15 +1456,22 @@ #include "code\game\objects\items\devices\radio\encryptionkey.dm" #include "code\game\objects\items\devices\radio\encryptionkey_vr.dm" #include "code\game\objects\items\devices\radio\headset.dm" +<<<<<<< HEAD #include "code\game\objects\items\devices\radio\headset_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\radio\headset_vr.dm" #include "code\game\objects\items\devices\radio\intercom.dm" #include "code\game\objects\items\devices\radio\jammer.dm" #include "code\game\objects\items\devices\radio\jammer_vr.dm" #include "code\game\objects\items\devices\radio\radio.dm" +<<<<<<< HEAD #include "code\game\objects\items\devices\radio\radio_ch.dm" #include "code\game\objects\items\devices\radio\radio_vr.dm" #include "code\game\objects\items\devices\radio\radio_yw.dm" +======= +#include "code\game\objects\items\devices\radio\radio_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\radio\radiopack.dm" #include "code\game\objects\items\robot\robot_items.dm" #include "code\game\objects\items\robot\robot_parts.dm" @@ -1302,17 +1488,25 @@ #include "code\game\objects\items\stacks\telecrystal.dm" #include "code\game\objects\items\stacks\tickets.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm" +<<<<<<< HEAD #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles_yw.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" #include "code\game\objects\items\stacks\tiles\tile_types_ch.dm" #include "code\game\objects\items\stacks\tiles\tile_types_yw.dm" +======= +#include "code\game\objects\items\stacks\tiles\tile_types.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\toys\balls_vr.dm" #include "code\game\objects\items\toys\godfigures.dm" #include "code\game\objects\items\toys\mech_toys.dm" #include "code\game\objects\items\toys\toys.dm" +<<<<<<< HEAD #include "code\game\objects\items\toys\toys_ch.dm" #include "code\game\objects\items\toys\toys_vr.dm" #include "code\game\objects\items\toys\toys_yw.dm" +======= +#include "code\game\objects\items\toys\toys_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\AI_modules_vr.dm" #include "code\game\objects\items\weapons\augment_items.dm" @@ -1333,14 +1527,21 @@ #include "code\game\objects\items\weapons\extinguisher.dm" #include "code\game\objects\items\weapons\flamethrower.dm" #include "code\game\objects\items\weapons\gift_wrappaper.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\gift_wrappaper_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\handcuffs.dm" #include "code\game\objects\items\weapons\handcuffs_vr.dm" #include "code\game\objects\items\weapons\improvised_components.dm" #include "code\game\objects\items\weapons\inducer_vr.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\lego.dm" #include "code\game\objects\items\weapons\manuals.dm" #include "code\game\objects\items\weapons\manuals_ch.dm" +======= +#include "code\game\objects\items\weapons\manuals.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\manuals_vr.dm" #include "code\game\objects\items\weapons\mop.dm" #include "code\game\objects\items\weapons\mop_deploy.dm" @@ -1360,7 +1561,10 @@ #include "code\game\objects\items\weapons\swords_axes_etc.dm" #include "code\game\objects\items\weapons\syndie.dm" #include "code\game\objects\items\weapons\tape.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\taskmanager_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\teleportation.dm" #include "code\game\objects\items\weapons\towels.dm" #include "code\game\objects\items\weapons\traps.dm" @@ -1368,6 +1572,7 @@ #include "code\game\objects\items\weapons\trays.dm" #include "code\game\objects\items\weapons\weaponry.dm" #include "code\game\objects\items\weapons\weldbackpack.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\weldbackpack_ch.dm" #include "code\game\objects\items\weapons\circuitboards\broken.dm" #include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" @@ -1377,6 +1582,13 @@ #include "code\game\objects\items\weapons\circuitboards\frame_ch.dm" #include "code\game\objects\items\weapons\circuitboards\mecha.dm" #include "code\game\objects\items\weapons\circuitboards\mecha_ch.dm" +======= +#include "code\game\objects\items\weapons\circuitboards\broken.dm" +#include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" +#include "code\game\objects\items\weapons\circuitboards\circuitboards_vr.dm" +#include "code\game\objects\items\weapons\circuitboards\frame.dm" +#include "code\game\objects\items\weapons\circuitboards\mecha.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\circuitboards\other.dm" #include "code\game\objects\items\weapons\circuitboards\computer\air_management.dm" #include "code\game\objects\items\weapons\circuitboards\computer\camera_monitor.dm" @@ -1406,7 +1618,10 @@ #include "code\game\objects\items\weapons\grenades\anti_photon_grenade.dm" #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" #include "code\game\objects\items\weapons\grenades\concussion.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\grenades\confetti_grenade_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\grenades\emgrenade.dm" #include "code\game\objects\items\weapons\grenades\explosive.dm" #include "code\game\objects\items\weapons\grenades\flashbang.dm" @@ -1414,18 +1629,27 @@ #include "code\game\objects\items\weapons\grenades\projectile.dm" #include "code\game\objects\items\weapons\grenades\smokebomb.dm" #include "code\game\objects\items\weapons\grenades\spawnergrenade.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\grenades\spawnergrenade_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\grenades\spawnergrenade_vr.dm" #include "code\game\objects\items\weapons\grenades\supermatter.dm" #include "code\game\objects\items\weapons\id cards\cards.dm" #include "code\game\objects\items\weapons\id cards\cards_vr.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\id cards\CH_ids.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\id cards\id_stacks.dm" #include "code\game\objects\items\weapons\id cards\id_stacks_vr.dm" #include "code\game\objects\items\weapons\id cards\station_ids.dm" #include "code\game\objects\items\weapons\id cards\station_ids_vr.dm" #include "code\game\objects\items\weapons\id cards\syndicate_ids.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\id cards\YW_ids.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\implants\implant.dm" #include "code\game\objects\items\weapons\implants\implant_vr.dm" #include "code\game\objects\items\weapons\implants\implantaugment.dm" @@ -1439,7 +1663,10 @@ #include "code\game\objects\items\weapons\implants\implantfreedom.dm" #include "code\game\objects\items\weapons\implants\implantlanguage.dm" #include "code\game\objects\items\weapons\implants\implantpad.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\implants\implantreagent_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\implants\implantreagent_vr.dm" #include "code\game\objects\items\weapons\implants\implantrestrainingbolt.dm" #include "code\game\objects\items\weapons\implants\implantuplink.dm" @@ -1455,13 +1682,19 @@ #include "code\game\objects\items\weapons\material\material_armor.dm" #include "code\game\objects\items\weapons\material\material_weapons.dm" #include "code\game\objects\items\weapons\material\misc.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\material\misc_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\material\shards.dm" #include "code\game\objects\items\weapons\material\shards_vr.dm" #include "code\game\objects\items\weapons\material\swords.dm" #include "code\game\objects\items\weapons\material\thrown.dm" #include "code\game\objects\items\weapons\material\twohanded.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\material\twohanded_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\material\twohanded_vr.dm" #include "code\game\objects\items\weapons\material\whetstone.dm" #include "code\game\objects\items\weapons\melee\deflect.dm" @@ -1477,13 +1710,19 @@ #include "code\game\objects\items\weapons\storage\belt_vr.dm" #include "code\game\objects\items\weapons\storage\bible.dm" #include "code\game\objects\items\weapons\storage\boxes.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\storage\boxes_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\storage\boxes_vr.dm" #include "code\game\objects\items\weapons\storage\briefcase.dm" #include "code\game\objects\items\weapons\storage\egg_vr.dm" #include "code\game\objects\items\weapons\storage\fancy.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\storage\fancy_ch.dm" #include "code\game\objects\items\weapons\storage\fancy_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\storage\firstaid.dm" #include "code\game\objects\items\weapons\storage\firstaid_vr.dm" #include "code\game\objects\items\weapons\storage\internal.dm" @@ -1510,12 +1749,18 @@ #include "code\game\objects\items\weapons\tools\weldingtool.dm" #include "code\game\objects\items\weapons\tools\wirecutters.dm" #include "code\game\objects\items\weapons\tools\wrench.dm" +<<<<<<< HEAD #include "code\game\objects\items\weapons\tools\zspicytools_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\random\_random.dm" #include "code\game\objects\random\guns_and_ammo.dm" #include "code\game\objects\random\maintenance.dm" #include "code\game\objects\random\mapping.dm" +<<<<<<< HEAD #include "code\game\objects\random\mapping_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\random\mapping_vr.dm" #include "code\game\objects\random\mechs.dm" #include "code\game\objects\random\misc.dm" @@ -1530,7 +1775,10 @@ #include "code\game\objects\structures\bedsheet_bin.dm" #include "code\game\objects\structures\bedsheet_bin_vr.dm" #include "code\game\objects\structures\bonfire.dm" +<<<<<<< HEAD #include "code\game\objects\structures\boxing_rope_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\catwalk.dm" #include "code\game\objects\structures\cliff.dm" #include "code\game\objects\structures\coathanger.dm" @@ -1559,7 +1807,10 @@ #include "code\game\objects\structures\ledges.dm" #include "code\game\objects\structures\lightpost.dm" #include "code\game\objects\structures\loot_piles.dm" +<<<<<<< HEAD #include "code\game\objects\structures\loot_piles_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\low_wall.dm" #include "code\game\objects\structures\map_blocker_vr.dm" #include "code\game\objects\structures\medical_stand_vr.dm" @@ -1567,10 +1818,15 @@ #include "code\game\objects\structures\mop_bucket.dm" #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\morgue_vr.dm" +<<<<<<< HEAD #include "code\game\objects\structures\new_signs.dm" #include "code\game\objects\structures\plasticflaps.dm" #include "code\game\objects\structures\railing.dm" #include "code\game\objects\structures\reflectors_ch.dm" +======= +#include "code\game\objects\structures\plasticflaps.dm" +#include "code\game\objects\structures\railing.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\safe.dm" #include "code\game\objects\structures\salvageable.dm" #include "code\game\objects\structures\signs.dm" @@ -1583,7 +1839,10 @@ #include "code\game\objects\structures\target_stake.dm" #include "code\game\objects\structures\transit_tubes.dm" #include "code\game\objects\structures\trash_pile_vr.dm" +<<<<<<< HEAD #include "code\game\objects\structures\trash_pile_vr_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\under_wardrobe.dm" #include "code\game\objects\structures\watercloset.dm" #include "code\game\objects\structures\watercloset_vr.dm" @@ -1597,12 +1856,18 @@ #include "code\game\objects\structures\crates_lockers\__closets.dm" #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions.dm" #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_vr.dm" +<<<<<<< HEAD #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\crates_lockers\crates.dm" #include "code\game\objects\structures\crates_lockers\crates_vr.dm" #include "code\game\objects\structures\crates_lockers\largecrate.dm" #include "code\game\objects\structures\crates_lockers\largecrate_vr.dm" +<<<<<<< HEAD #include "code\game\objects\structures\crates_lockers\largecrate_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\crates_lockers\vehiclecage.dm" #include "code\game\objects\structures\crates_lockers\closets\coffin.dm" #include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm" @@ -1617,7 +1882,10 @@ #include "code\game\objects\structures\crates_lockers\closets\syndicate.dm" #include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\utility_closets_vr.dm" +<<<<<<< HEAD #include "code\game\objects\structures\crates_lockers\closets\utility_closets_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\crates_lockers\closets\walllocker.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe_vr.dm" @@ -1667,21 +1935,30 @@ #include "code\game\objects\structures\stool_bed_chair_nest\alien_nests.dm" #include "code\game\objects\structures\stool_bed_chair_nest\bed.dm" #include "code\game\objects\structures\stool_bed_chair_nest\chairs.dm" +<<<<<<< HEAD #include "code\game\objects\structures\stool_bed_chair_nest\chairs_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\stool_bed_chair_nest\chairs_vr.dm" #include "code\game\objects\structures\stool_bed_chair_nest\stools.dm" #include "code\game\objects\structures\stool_bed_chair_nest\stools_vr.dm" #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair.dm" #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair_item.dm" #include "code\game\turfs\simulated.dm" +<<<<<<< HEAD #include "code\game\turfs\simulated_ch.dm" #include "code\game\turfs\simulated_vr.dm" #include "code\game\turfs\turf.dm" #include "code\game\turfs\turf_ch.dm" +======= +#include "code\game\turfs\simulated_vr.dm" +#include "code\game\turfs\turf.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\turf_changing.dm" #include "code\game\turfs\turf_flick_animations.dm" #include "code\game\turfs\unsimulated.dm" #include "code\game\turfs\weird_turfs_vr.dm" +<<<<<<< HEAD #include "code\game\turfs\flooring\floor_yw.dm" #include "code\game\turfs\flooring\flooring.dm" #include "code\game\turfs\flooring\flooring_ch.dm" @@ -1689,6 +1966,11 @@ #include "code\game\turfs\flooring\flooring_decals_ch.dm" #include "code\game\turfs\flooring\flooring_decals_vr.dm" #include "code\game\turfs\flooring\flooring_decals_yw.dm" +======= +#include "code\game\turfs\flooring\flooring.dm" +#include "code\game\turfs\flooring\flooring_decals.dm" +#include "code\game\turfs\flooring\flooring_decals_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\flooring\flooring_premade.dm" #include "code\game\turfs\flooring\flooring_vr.dm" #include "code\game\turfs\flooring\shuttle_vr.dm" @@ -1713,7 +1995,10 @@ #include "code\game\turfs\simulated\walls.dm" #include "code\game\turfs\simulated\water.dm" #include "code\game\turfs\simulated\water_vr.dm" +<<<<<<< HEAD #include "code\game\turfs\simulated\water_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\simulated\dungeon\floor.dm" #include "code\game\turfs\simulated\dungeon\wall.dm" #include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm" @@ -1734,7 +2019,11 @@ #include "code\game\turfs\unsimulated\beach_vr.dm" #include "code\game\turfs\unsimulated\floor.dm" #include "code\game\turfs\unsimulated\planetary.dm" +<<<<<<< HEAD #include "code\game\turfs\unsimulated\planetary_yw.dm" +======= +#include "code\game\turfs\unsimulated\planetary_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\unsimulated\shuttle.dm" #include "code\game\turfs\unsimulated\sky_vr.dm" #include "code\game\turfs\unsimulated\walls.dm" @@ -1805,7 +2094,10 @@ #include "code\modules\admin\secrets\random_events\gravity.dm" #include "code\modules\admin\secrets\random_events\trigger_cordical_borer_infestation.dm" #include "code\modules\admin\secrets\random_events\trigger_xenomorph_infestation.dm" +<<<<<<< HEAD #include "code\modules\admin\verbs\admin_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\admin\verbs\adminhelp.dm" #include "code\modules\admin\verbs\adminhelp_vr.dm" #include "code\modules\admin\verbs\adminjump.dm" @@ -1819,9 +2111,15 @@ #include "code\modules\admin\verbs\check_customitem_activity.dm" #include "code\modules\admin\verbs\cinematic.dm" #include "code\modules\admin\verbs\custom_event.dm" +<<<<<<< HEAD #include "code\modules\admin\verbs\deadsay.dm" #include "code\modules\admin\verbs\debug.dm" #include "code\modules\admin\verbs\debug_ch.dm" +======= +#include "code\modules\admin\verbs\dbcon_fix.dm" +#include "code\modules\admin\verbs\deadsay.dm" +#include "code\modules\admin\verbs\debug.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\admin\verbs\debug_vr.dm" #include "code\modules\admin\verbs\diagnostics.dm" #include "code\modules\admin\verbs\dice.dm" @@ -1871,9 +2169,13 @@ #include "code\modules\ai\ai_holder_targeting_vr.dm" #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" +<<<<<<< HEAD #include "code\modules\ai\say_list_ch.dm" #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_ch.dm" +======= +#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" #include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" @@ -1944,6 +2246,7 @@ #include "code\modules\blob2\overmind\types\shifting_fragments.dm" #include "code\modules\blob2\overmind\types\synchronous_mesh.dm" #include "code\modules\blob2\overmind\types\volatile_alluvium.dm" +<<<<<<< HEAD #include "code\modules\busy_space_yw\air_traffic.dm" #include "code\modules\busy_space_yw\loremaster.dm" #include "code\modules\busy_space_yw\organizations.dm" @@ -1951,6 +2254,21 @@ #include "code\modules\catalogue\catalogue_data.dm" #include "code\modules\catalogue\catalogue_data_vr.dm" #include "code\modules\catalogue\catalogue_data_yw.dm" +======= +#include "code\modules\busy_space_vr\air_traffic.dm" +#include "code\modules\busy_space_vr\loremaster.dm" +#include "code\modules\busy_space_vr\organizations.dm" +#include "code\modules\casino\casino.dm" +#include "code\modules\casino\casino_book.dm" +#include "code\modules\casino\casino_cards.dm" +#include "code\modules\casino\casino_prize_vendor.dm" +#include "code\modules\casino\premium_dispenser.dm" +#include "code\modules\casino\premium_vendors.dm" +#include "code\modules\casino\slots.dm" +#include "code\modules\catalogue\atoms.dm" +#include "code\modules\catalogue\catalogue_data.dm" +#include "code\modules\catalogue\catalogue_data_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\catalogue\cataloguer.dm" #include "code\modules\catalogue\cataloguer_visuals.dm" #include "code\modules\catalogue\cataloguer_vr.dm" @@ -1959,6 +2277,7 @@ #include "code\modules\client\client procs_vr.dm" #include "code\modules\client\movement.dm" #include "code\modules\client\preferences.dm" +<<<<<<< HEAD #include "code\modules\client\preferences_ch.dm" #include "code\modules\client\preferences_factions.dm" #include "code\modules\client\preferences_savefile.dm" @@ -1967,6 +2286,13 @@ #include "code\modules\client\preferences_toggle_procs.dm" #include "code\modules\client\preferences_vr.dm" #include "code\modules\client\preferences_yw.dm" +======= +#include "code\modules\client\preferences_factions.dm" +#include "code\modules\client\preferences_savefile.dm" +#include "code\modules\client\preferences_spawnpoints.dm" +#include "code\modules\client\preferences_toggle_procs.dm" +#include "code\modules\client\preferences_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\spam_prevention.dm" #include "code\modules\client\stored_item.dm" #include "code\modules\client\ui_style.dm" @@ -1978,7 +2304,10 @@ #include "code\modules\client\preference_setup\general\01_basic.dm" #include "code\modules\client\preference_setup\general\02_language.dm" #include "code\modules\client\preference_setup\general\03_body.dm" +<<<<<<< HEAD #include "code\modules\client\preference_setup\general\03_body_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\general\04_equipment.dm" #include "code\modules\client\preference_setup\general\05_background.dm" #include "code\modules\client\preference_setup\general\06_flavor.dm" @@ -1992,28 +2321,40 @@ #include "code\modules\client\preference_setup\loadout\loadout.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories_vr.dm" +<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_accessories_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm" #include "code\modules\client\preference_setup\loadout\loadout_cosmetics_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_cyberware.dm" #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes_vr.dm" +<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_eyes_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems_ch.dm" +======= +#include "code\modules\client\preference_setup\loadout\loadout_fluffitems_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_general.dm" #include "code\modules\client\preference_setup\loadout\loadout_general_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" +<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_head_ch.dm" #include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head_yw.dm" +======= +#include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" +<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_smoking_ch.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" @@ -2028,6 +2369,16 @@ #include "code\modules\client\preference_setup\loadout\loadout_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno_ch.dm" +======= +#include "code\modules\client\preference_setup\loadout\loadout_suit.dm" +#include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" +#include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_utility.dm" +#include "code\modules\client\preference_setup\loadout\loadout_utility_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_xeno.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_xeno_vr.dm" #include "code\modules\client\preference_setup\occupation\occupation.dm" #include "code\modules\client\preference_setup\skills\skills.dm" @@ -2046,12 +2397,19 @@ #include "code\modules\client\verbs\character_directory.dm" #include "code\modules\client\verbs\ignore.dm" #include "code\modules\client\verbs\ooc.dm" +<<<<<<< HEAD +======= +#include "code\modules\client\verbs\ping.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\verbs\suicide.dm" #include "code\modules\client\verbs\who.dm" #include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\clothing_accessories.dm" +<<<<<<< HEAD #include "code\modules\clothing\clothing_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\clothing_icons.dm" #include "code\modules\clothing\clothing_vr.dm" #include "code\modules\clothing\ears\earrings.dm" @@ -2072,6 +2430,7 @@ #include "code\modules\clothing\head\flowercrowns.dm" #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\helmet.dm" +<<<<<<< HEAD #include "code\modules\clothing\head\helmet_ch.dm" #include "code\modules\clothing\head\helmet_vr.dm" #include "code\modules\clothing\head\hood.dm" @@ -2082,6 +2441,14 @@ #include "code\modules\clothing\head\jobs_yw.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_ch.dm" +======= +#include "code\modules\clothing\head\helmet_vr.dm" +#include "code\modules\clothing\head\hood.dm" +#include "code\modules\clothing\head\hood_vr.dm" +#include "code\modules\clothing\head\jobs.dm" +#include "code\modules\clothing\head\jobs_vr.dm" +#include "code\modules\clothing\head\misc.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\misc_vr.dm" #include "code\modules\clothing\head\pilot_helmet.dm" @@ -2097,7 +2464,10 @@ #include "code\modules\clothing\masks\hailer.dm" #include "code\modules\clothing\masks\miscellaneous.dm" #include "code\modules\clothing\masks\shiny_vr.dm" +<<<<<<< HEAD #include "code\modules\clothing\masks\tesh_synth_facemask.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\masks\voice.dm" #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" @@ -2123,9 +2493,13 @@ #include "code\modules\clothing\spacesuits\rig\rig_tgui.dm" #include "code\modules\clothing\spacesuits\rig\rig_verbs.dm" #include "code\modules\clothing\spacesuits\rig\rig_wiring.dm" +<<<<<<< HEAD #include "code\modules\clothing\spacesuits\rig\modules\combat_ch.dm" #include "code\modules\clothing\spacesuits\rig\modules\modules.dm" #include "code\modules\clothing\spacesuits\rig\modules\utility_ch.dm" +======= +#include "code\modules\clothing\spacesuits\rig\modules\modules.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\spacesuits\rig\modules\specific\ai_container.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\chem_dispenser.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\cleaner_launcher.dm" @@ -2150,7 +2524,10 @@ #include "code\modules\clothing\spacesuits\rig\modules\specific\vision.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\voice.dm" #include "code\modules\clothing\spacesuits\rig\suits\alien.dm" +<<<<<<< HEAD #include "code\modules\clothing\spacesuits\rig\suits\alien_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\spacesuits\rig\suits\combat.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert_vr.dm" @@ -2159,7 +2536,10 @@ #include "code\modules\clothing\spacesuits\rig\suits\pmc.dm" #include "code\modules\clothing\spacesuits\rig\suits\robotics.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" +<<<<<<< HEAD #include "code\modules\clothing\spacesuits\rig\suits\station_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" #include "code\modules\clothing\spacesuits\void\ert_vr.dm" #include "code\modules\clothing\spacesuits\void\event.dm" @@ -2172,6 +2552,7 @@ #include "code\modules\clothing\spacesuits\void\void_vr.dm" #include "code\modules\clothing\spacesuits\void\wizard.dm" #include "code\modules\clothing\spacesuits\void\zaddat.dm" +<<<<<<< HEAD #include "code\modules\clothing\spacesuits\void\zaddat_yw.dm" #include "code\modules\clothing\suits\armor.dm" #include "code\modules\clothing\suits\armor_vr.dm" @@ -2182,6 +2563,14 @@ #include "code\modules\clothing\suits\hooded_ch.dm" #include "code\modules\clothing\suits\hooded_vr.dm" #include "code\modules\clothing\suits\hooded_yw.dm" +======= +#include "code\modules\clothing\suits\armor.dm" +#include "code\modules\clothing\suits\armor_vr.dm" +#include "code\modules\clothing\suits\bio.dm" +#include "code\modules\clothing\suits\bio_vr.dm" +#include "code\modules\clothing\suits\hooded.dm" +#include "code\modules\clothing\suits\hooded_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\jobs_vr.dm" #include "code\modules\clothing\suits\labcoat.dm" @@ -2191,33 +2580,51 @@ #include "code\modules\clothing\suits\solgov.dm" #include "code\modules\clothing\suits\solgov_vr.dm" #include "code\modules\clothing\suits\storage.dm" +<<<<<<< HEAD #include "code\modules\clothing\suits\storage_yw.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\utility_vr.dm" #include "code\modules\clothing\suits\wiz_robe.dm" #include "code\modules\clothing\suits\wolfbrigade.dm" +======= +#include "code\modules\clothing\suits\utility.dm" +#include "code\modules\clothing\suits\utility_vr.dm" +#include "code\modules\clothing\suits\wiz_robe.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\suits\aliens\tajara.dm" #include "code\modules\clothing\suits\aliens\teshari.dm" #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" #include "code\modules\clothing\under\color.dm" +<<<<<<< HEAD #include "code\modules\clothing\under\extrauniforms_yw.dm" #include "code\modules\clothing\under\imperial_vr.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\miscellaneous_ch.dm" +======= +#include "code\modules\clothing\under\imperial_vr.dm" +#include "code\modules\clothing\under\miscellaneous.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\under\miscellaneous_vr.dm" #include "code\modules\clothing\under\nanotrasen_vr.dm" #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shiny_vr.dm" #include "code\modules\clothing\under\shorts.dm" +<<<<<<< HEAD #include "code\modules\clothing\under\shorts_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\under\solgov.dm" #include "code\modules\clothing\under\solgov_vr.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" +<<<<<<< HEAD #include "code\modules\clothing\under\accessories\accessory_ch.dm" #include "code\modules\clothing\under\accessories\accessory_vr.dm" #include "code\modules\clothing\under\accessories\accessory_yw.dm" +======= +#include "code\modules\clothing\under\accessories\accessory_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\under\accessories\armband.dm" #include "code\modules\clothing\under\accessories\armor.dm" #include "code\modules\clothing\under\accessories\badges.dm" @@ -2262,7 +2669,11 @@ #include "code\modules\economy\ATM.dm" #include "code\modules\economy\cash.dm" #include "code\modules\economy\cash_register.dm" +<<<<<<< HEAD #include "code\modules\economy\casinocash_ch.dm" +======= +#include "code\modules\economy\casinocash.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\economy\coins.dm" #include "code\modules\economy\coins_vr.dm" #include "code\modules\economy\economy_misc.dm" @@ -2273,8 +2684,11 @@ #include "code\modules\economy\mint.dm" #include "code\modules\economy\money_bag.dm" #include "code\modules\economy\price_list.dm" +<<<<<<< HEAD #include "code\modules\economy\price_list_ch.dm" #include "code\modules\economy\price_list_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\economy\retail_scanner.dm" #include "code\modules\economy\TradeDestinations.dm" #include "code\modules\economy\vending.dm" @@ -2290,7 +2704,10 @@ #include "code\modules\emotes\definitions\audible_cough.dm" #include "code\modules\emotes\definitions\audible_furry_vr.dm" #include "code\modules\emotes\definitions\audible_scream.dm" +<<<<<<< HEAD #include "code\modules\emotes\definitions\audible_scream_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\emotes\definitions\audible_scream_vr.dm" #include "code\modules\emotes\definitions\audible_slap.dm" #include "code\modules\emotes\definitions\audible_snap.dm" @@ -2324,7 +2741,10 @@ #include "code\modules\events\drone_pod_vr.dm" #include "code\modules\events\dust.dm" #include "code\modules\events\electrical_storm.dm" +<<<<<<< HEAD #include "code\modules\events\electrified_door.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\event.dm" #include "code\modules\events\event_container.dm" #include "code\modules\events\event_container_vr.dm" @@ -2340,12 +2760,18 @@ #include "code\modules\events\maintenance_predator_vr.dm" #include "code\modules\events\meteor_strike_vr.dm" #include "code\modules\events\meteors.dm" +<<<<<<< HEAD #include "code\modules\events\metroid_infestation.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\money_hacker.dm" #include "code\modules\events\money_lotto.dm" #include "code\modules\events\money_spam.dm" #include "code\modules\events\morph_spawn_vr.dm" +<<<<<<< HEAD #include "code\modules\events\mutants.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\prison_break.dm" #include "code\modules\events\radiation_storm.dm" #include "code\modules\events\random_antagonist.dm" @@ -2355,18 +2781,27 @@ #include "code\modules\events\space_ninja.dm" #include "code\modules\events\spacevine.dm" #include "code\modules\events\spider_infestation.dm" +<<<<<<< HEAD #include "code\modules\events\spider_migration_yw.dm" #include "code\modules\events\spontaneous_appendicitis.dm" #include "code\modules\events\spontaneous_appendicitis_vr.dm" #include "code\modules\events\supply_demand_vr.dm" #include "code\modules\events\viral_infection.dm" +======= +#include "code\modules\events\spontaneous_appendicitis.dm" +#include "code\modules\events\spontaneous_appendicitis_vr.dm" +#include "code\modules\events\supply_demand_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\wallrot.dm" #include "code\modules\examine\examine.dm" #include "code\modules\examine\stat_icons.dm" #include "code\modules\examine\descriptions\armor.dm" #include "code\modules\examine\descriptions\atmospherics.dm" #include "code\modules\examine\descriptions\containers.dm" +<<<<<<< HEAD #include "code\modules\examine\descriptions\containers_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\examine\descriptions\devices.dm" #include "code\modules\examine\descriptions\engineering.dm" #include "code\modules\examine\descriptions\machines.dm" @@ -2396,35 +2831,53 @@ #include "code\modules\food\recipes_fryer_vr.dm" #include "code\modules\food\recipes_grill.dm" #include "code\modules\food\recipes_microwave.dm" +<<<<<<< HEAD #include "code\modules\food\recipes_microwave_ch.dm" #include "code\modules\food\recipes_microwave_vr.dm" #include "code\modules\food\recipes_oven.dm" #include "code\modules\food\recipes_oven_ch.dm" +======= +#include "code\modules\food\recipes_microwave_vr.dm" +#include "code\modules\food\recipes_oven.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\recipes_oven_vr.dm" #include "code\modules\food\drinkingglass\drinkingglass.dm" #include "code\modules\food\drinkingglass\extras.dm" #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" +<<<<<<< HEAD #include "code\modules\food\drinkingglass\metaglass_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\drinkingglass\metaglass_vr.dm" #include "code\modules\food\drinkingglass\serving_glasses.dm" #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\drinkingglass\shaker_vr.dm" #include "code\modules\food\food\cans.dm" +<<<<<<< HEAD #include "code\modules\food\food\cans_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" #include "code\modules\food\food\drinks_vr.dm" #include "code\modules\food\food\lunch.dm" #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" +<<<<<<< HEAD #include "code\modules\food\food\snacks_ch.dm" #include "code\modules\food\food\snacks_vr.dm" #include "code\modules\food\food\thecake_ch.dm" #include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" #include "code\modules\food\food\drinks\bottle_ch.dm" +======= +#include "code\modules\food\food\snacks_vr.dm" +#include "code\modules\food\food\thecake.dm" +#include "code\modules\food\food\z_custom_food_vr.dm" +#include "code\modules\food\food\drinks\bottle.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\food\drinks\cup.dm" #include "code\modules\food\food\drinks\drinkingglass.dm" #include "code\modules\food\food\drinks\jar.dm" @@ -2436,7 +2889,10 @@ #include "code\modules\food\kitchen\gibber.dm" #include "code\modules\food\kitchen\icecream.dm" #include "code\modules\food\kitchen\microwave.dm" +<<<<<<< HEAD #include "code\modules\food\kitchen\microwave_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\kitchen\cooking_machines\_appliance.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" @@ -2501,7 +2957,10 @@ #include "code\modules\games\cah_white_cards.dm" #include "code\modules\games\cardemon.dm" #include "code\modules\games\cards.dm" +<<<<<<< HEAD #include "code\modules\games\cards_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\games\dice.dm" #include "code\modules\games\spaceball_cards.dm" #include "code\modules\games\tarot.dm" @@ -2518,17 +2977,27 @@ #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\grown_inedible.dm" #include "code\modules\hydroponics\grown_predefined.dm" +<<<<<<< HEAD #include "code\modules\hydroponics\seed.dm" #include "code\modules\hydroponics\seed_datums_ch.dm" #include "code\modules\hydroponics\seed_datums_vr.dm" #include "code\modules\hydroponics\seed_datums_yw.dm" +======= +#include "code\modules\hydroponics\grown_sif.dm" +#include "code\modules\hydroponics\seed.dm" +#include "code\modules\hydroponics\seed_datums_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\hydroponics\seed_gene_mut.dm" #include "code\modules\hydroponics\seed_machines.dm" #include "code\modules\hydroponics\seed_mobs.dm" #include "code\modules\hydroponics\seed_packets.dm" +<<<<<<< HEAD #include "code\modules\hydroponics\seed_packets_ch.dm" #include "code\modules\hydroponics\seed_packets_vr.dm" #include "code\modules\hydroponics\seed_packets_yw.dm" +======= +#include "code\modules\hydroponics\seed_packets_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\hydroponics\seed_storage.dm" #include "code\modules\hydroponics\seed_storage_vr.dm" #include "code\modules\hydroponics\beekeeping\beehive.dm" @@ -2595,7 +3064,10 @@ #include "code\modules\identification\identification.dm" #include "code\modules\identification\item_procs.dm" #include "code\modules\instruments\items.dm" +<<<<<<< HEAD #include "code\modules\instruments\items_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\instruments\stationary.dm" #include "code\modules\instruments\instrument_data\_instrument_data.dm" #include "code\modules\instruments\instrument_data\_instrument_key.dm" @@ -2648,7 +3120,10 @@ #include "code\modules\integrated_electronics\subtypes\smart.dm" #include "code\modules\integrated_electronics\subtypes\time.dm" #include "code\modules\integrated_electronics\subtypes\trig.dm" +<<<<<<< HEAD #include "code\modules\integrated_electronics\subtypes\z_mixed_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\integrated_electronics\~defines\~defines.dm" #include "code\modules\keybindings\bindings_atom.dm" #include "code\modules\keybindings\bindings_movekeys.dm" @@ -2681,11 +3156,19 @@ #include "code\modules\lore_codex\codex.dm" #include "code\modules\lore_codex\codex_tree.dm" #include "code\modules\lore_codex\pages.dm" +<<<<<<< HEAD #include "code\modules\lore_codex\lore_data_yw\important_locations.dm" #include "code\modules\lore_codex\lore_data_yw\main.dm" #include "code\modules\lore_codex\lore_data_yw\orgs.dm" #include "code\modules\lore_codex\lore_data_yw\political_parties.dm" #include "code\modules\lore_codex\lore_data_yw\species.dm" +======= +#include "code\modules\lore_codex\lore_data_vr\important_locations.dm" +#include "code\modules\lore_codex\lore_data_vr\main.dm" +#include "code\modules\lore_codex\lore_data_vr\orgs.dm" +#include "code\modules\lore_codex\lore_data_vr\political_parties.dm" +#include "code\modules\lore_codex\lore_data_vr\species.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\lore_codex\news_data\main.dm" #include "code\modules\lore_codex\robutt_data\bybrand.dm" #include "code\modules\lore_codex\robutt_data\main_robutts.dm" @@ -2709,7 +3192,10 @@ #include "code\modules\materials\materials\holographic.dm" #include "code\modules\materials\materials\other_vr.dm" #include "code\modules\materials\materials\plastic.dm" +<<<<<<< HEAD #include "code\modules\materials\materials\plastic_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\materials\materials\snow.dm" #include "code\modules\materials\materials\stone.dm" #include "code\modules\materials\materials\supermatter.dm" @@ -2718,17 +3204,26 @@ #include "code\modules\materials\materials\metals\metals.dm" #include "code\modules\materials\materials\metals\metals_vr.dm" #include "code\modules\materials\materials\metals\plasteel.dm" +<<<<<<< HEAD #include "code\modules\materials\materials\metals\plasteel_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\materials\materials\metals\plasteel_vr.dm" #include "code\modules\materials\materials\metals\steel.dm" #include "code\modules\materials\materials\metals\steel_vr.dm" #include "code\modules\materials\materials\organic\animal_products.dm" #include "code\modules\materials\materials\organic\cloth.dm" +<<<<<<< HEAD #include "code\modules\materials\materials\organic\cloth_ch.dm" #include "code\modules\materials\materials\organic\leather.dm" #include "code\modules\materials\materials\organic\resin.dm" #include "code\modules\materials\materials\organic\wood.dm" #include "code\modules\materials\materials\organic\wood_ch.dm" +======= +#include "code\modules\materials\materials\organic\leather.dm" +#include "code\modules\materials\materials\organic\resin.dm" +#include "code\modules\materials\materials\organic\wood.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\materials\sheets\_sheets.dm" #include "code\modules\materials\sheets\gems.dm" #include "code\modules\materials\sheets\glass.dm" @@ -2831,7 +3326,10 @@ #include "code\modules\mob\_modifiers\traits_phobias.dm" #include "code\modules\mob\_modifiers\unholy.dm" #include "code\modules\mob\dead\corpse.dm" +<<<<<<< HEAD #include "code\modules\mob\dead\corpse_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\dead\corpse_vr.dm" #include "code\modules\mob\dead\death.dm" #include "code\modules\mob\dead\observer\free_vr.dm" @@ -2859,7 +3357,10 @@ #include "code\modules\mob\language\outsider.dm" #include "code\modules\mob\language\station.dm" #include "code\modules\mob\language\station_vr.dm" +<<<<<<< HEAD #include "code\modules\mob\language\station_YW.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\language\synthetic.dm" #include "code\modules\mob\living\autohiss.dm" #include "code\modules\mob\living\butchering.dm" @@ -2869,7 +3370,10 @@ #include "code\modules\mob\living\inventory.dm" #include "code\modules\mob\living\life.dm" #include "code\modules\mob\living\living.dm" +<<<<<<< HEAD #include "code\modules\mob\living\living_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\living_defense.dm" #include "code\modules\mob\living\living_defines.dm" #include "code\modules\mob\living\living_defines_vr.dm" @@ -2944,24 +3448,36 @@ #include "code\modules\mob\living\carbon\human\human_damage.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\human_defines_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\human_defines_vr.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_helpers_vr.dm" #include "code\modules\mob\living\carbon\human\human_modular_limbs.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\human_movement_ch.dm" #include "code\modules\mob\living\carbon\human\human_organs.dm" #include "code\modules\mob\living\carbon\human\human_powers.dm" #include "code\modules\mob\living\carbon\human\human_powers_vr.dm" #include "code\modules\mob\living\carbon\human\human_powers_YW.dm" +======= +#include "code\modules\mob\living\carbon\human\human_organs.dm" +#include "code\modules\mob\living\carbon\human\human_powers.dm" +#include "code\modules\mob\living\carbon\human\human_powers_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\human_resist.dm" #include "code\modules\mob\living\carbon\human\human_species.dm" #include "code\modules\mob\living\carbon\human\human_species_vr.dm" #include "code\modules\mob\living\carbon\human\human_vr.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\life_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\life_vr.dm" #include "code\modules\mob\living\carbon\human\login.dm" #include "code\modules\mob\living\carbon\human\logout.dm" @@ -2971,7 +3487,10 @@ #include "code\modules\mob\living\carbon\human\stripping.dm" #include "code\modules\mob\living\carbon\human\unarmed_attack.dm" #include "code\modules\mob\living\carbon\human\update_icons.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\update_icons_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\ai_controlled\ai_controlled.dm" #include "code\modules\mob\living\carbon\human\descriptors\_descriptors.dm" #include "code\modules\mob\living\carbon\human\descriptors\descriptors_generic.dm" @@ -2980,7 +3499,10 @@ #include "code\modules\mob\living\carbon\human\species\species.dm" #include "code\modules\mob\living\carbon\human\species\species_attack.dm" #include "code\modules\mob\living\carbon\human\species\species_attack_vr.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\species_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\species_getters.dm" #include "code\modules\mob\living\carbon\human\species\species_getters_vr.dm" #include "code\modules\mob\living\carbon\human\species\species_helpers.dm" @@ -2993,6 +3515,10 @@ #include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm" #include "code\modules\mob\living\carbon\human\species\outsider\skeleton.dm" #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm" +<<<<<<< HEAD +======= +#include "code\modules\mob\living\carbon\human\species\outsider\vox_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\shadekin\_defines.dm" #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin.dm" #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin_abilities.dm" @@ -3000,15 +3526,21 @@ #include "code\modules\mob\living\carbon\human\species\station\alraune.dm" #include "code\modules\mob\living\carbon\human\species\station\blank_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\golem.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\station\greyYW.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\station\human_subspecies.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\station\station_ch.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_vr.dm" @@ -3021,6 +3553,7 @@ #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_powers.dm" #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_species.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\negative.dm" +<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\station\traits_vr\negative_ch.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral_ch.dm" @@ -3028,6 +3561,11 @@ #include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive_ch.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait_ch.dm" +======= +#include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm" +#include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive.dm" +#include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm" @@ -3087,13 +3625,19 @@ #include "code\modules\mob\living\silicon\robot\robot_animation_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_damage.dm" #include "code\modules\mob\living\silicon\robot\robot_items.dm" +<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\robot_modules_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\robot_movement.dm" #include "code\modules\mob\living\silicon\robot\robot_remote_control.dm" #include "code\modules\mob\living\silicon\robot\robot_vr.dm" #include "code\modules\mob\living\silicon\robot\syndicate.dm" #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm" +<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\drone.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm" @@ -3101,17 +3645,26 @@ #include "code\modules\mob\living\silicon\robot\drone\drone_damage.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm" +<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer_unify.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\swarm.dm" #include "code\modules\mob\living\silicon\robot\drone\swarm_abilities.dm" #include "code\modules\mob\living\silicon\robot\drone\swarm_items.dm" +<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\drone\zzz_unify_drone.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station_ch.dm" +======= +#include "code\modules\mob\living\silicon\robot\robot_modules\event.dm" +#include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm" +#include "code\modules\mob\living\silicon\robot\robot_modules\station.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\swarm.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\syndicate.dm" @@ -3125,11 +3678,18 @@ #include "code\modules\mob\living\silicon\robot\subtypes\thinktank\thinktank_module.dm" #include "code\modules\mob\living\silicon\robot\subtypes\thinktank\thinktank_storage.dm" #include "code\modules\mob\living\silicon\robot\subtypes\thinktank\thinktank_subtypes.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_animal\aliens\synx.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\appearance.dm" #include "code\modules\mob\living\simple_mob\butchering.dm" #include "code\modules\mob\living\simple_mob\combat.dm" #include "code\modules\mob\living\simple_mob\defense.dm" +<<<<<<< HEAD +======= +#include "code\modules\mob\living\simple_mob\donteatpets_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\hands.dm" #include "code\modules\mob\living\simple_mob\harvesting.dm" #include "code\modules\mob\living\simple_mob\life.dm" @@ -3138,11 +3698,17 @@ #include "code\modules\mob\living\simple_mob\sd_pets.dm" #include "code\modules\mob\living\simple_mob\simple_hud.dm" #include "code\modules\mob\living\simple_mob\simple_mob.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\simple_mob_ch.dm" #include "code\modules\mob\living\simple_mob\simple_mob_vr.dm" #include "code\modules\mob\living\simple_mob\taming.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\vox.dm" +======= +#include "code\modules\mob\living\simple_mob\simple_mob_vr.dm" +#include "code\modules\mob\living\simple_mob\taming.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\catslug.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\jellyfish.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\skeleton.dm" @@ -3172,22 +3738,33 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\thermic.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\tunneler.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\webslinger.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\hyena\hyena.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\armadillo_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\crab.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\jerboa_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard_mutant_event.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse_mutant_event.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\passive.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\penguin.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\possum.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\raccoon_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\cat.dm" @@ -3212,22 +3789,30 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\sif.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\siffet.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\space\animals_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bats.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bear.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\gaslamp_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\mouse_army_ch.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\space\snake_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\worm.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\horror\bradley.dm" #include "code\modules\mob\living\simple_mob\subtypes\horror\Eddy.dm" #include "code\modules\mob\living\simple_mob\subtypes\horror\horror .dm" @@ -3253,6 +3838,17 @@ #include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\corrupt_maint_drone_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\cyber_horror_ch.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\clown.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid_vr.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_vr.dm" +#include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm" +#include "code\modules\mob\living\simple_mob\subtypes\mechanical\corrupt_maint_drone_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\mechanical\disbot_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem_vr.dm" @@ -3282,6 +3878,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\ripley.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\ward\monitor_ward.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\ward\ward.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\metroid\metAI.dm" #include "code\modules\mob\living\simple_mob\subtypes\metroid\metBaseType.dm" #include "code\modules\mob\living\simple_mob\subtypes\metroid\metConsumption.dm" @@ -3292,6 +3889,11 @@ #include "code\modules\mob\living\simple_mob\subtypes\occult\faithless.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\_construct.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\_construct_ch.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\occult\creature.dm" +#include "code\modules\mob\living\simple_mob\subtypes\occult\faithless.dm" +#include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\_construct.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\artificer.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\harvester.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm" @@ -3314,7 +3916,10 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\c_pet.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\catgirl.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\chungus.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\cookiegirl.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\corrupt_hounds.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\deathclaw.dm" @@ -3323,32 +3928,49 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\fennec.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\fennix.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\frog.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\goia_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\greatwolf.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\hippo.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\horse.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\jelly.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\lamia.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\leopardmander_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\lizardman.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mimic.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mimic_ch.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\vore\leopardmander.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mimic.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\oregrub.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\otie.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\panther.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\rabbit.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\rat.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\rat_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\sect_drone.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\sect_queen.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\sheep.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\slug_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\snake.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\softdog.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub_larva.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\solarmoth_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\weretiger.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm" @@ -3358,12 +3980,16 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\_defines.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_abilities.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_abilities_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demonAI_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demonAI_subtypes_ch.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\~defines.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Big.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\bigclowns.dm" @@ -3375,6 +4001,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\honkelemental.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\regularclowns.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\morph\morph.dm" +<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\plants_ch\pitcher.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_procs.dm" @@ -3388,6 +4015,15 @@ #include "code\modules\mob\living\voice\voice_vr.dm" #include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\login_ch.dm" +======= +#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_procs.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\shadekin.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types.dm" +#include "code\modules\mob\living\voice\voice.dm" +#include "code\modules\mob\living\voice\voice_vr.dm" +#include "code\modules\mob\new_player\login.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\new_player\login_vr.dm" #include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\new_player.dm" @@ -3399,6 +4035,7 @@ #include "code\modules\mob\new_player\skill.dm" #include "code\modules\mob\new_player\sprite_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories_ear.dm" +<<<<<<< HEAD #include "code\modules\mob\new_player\sprite_accessories_ear_ch.dm" #include "code\modules\mob\new_player\sprite_accessories_ear_vr.dm" #include "code\modules\mob\new_player\sprite_accessories_extra.dm" @@ -3415,6 +4052,18 @@ #include "code\modules\mob\new_player\sprite_accessories_wing_ch.dm" #include "code\modules\mob\new_player\sprite_accessories_wing_vr.dm" #include "code\modules\mob\new_player\sprite_accessories_yw.dm" +======= +#include "code\modules\mob\new_player\sprite_accessories_ear_vr.dm" +#include "code\modules\mob\new_player\sprite_accessories_extra.dm" +#include "code\modules\mob\new_player\sprite_accessories_extra_vr.dm" +#include "code\modules\mob\new_player\sprite_accessories_tail.dm" +#include "code\modules\mob\new_player\sprite_accessories_tail_vr.dm" +#include "code\modules\mob\new_player\sprite_accessories_taur.dm" +#include "code\modules\mob\new_player\sprite_accessories_taur_vr.dm" +#include "code\modules\mob\new_player\sprite_accessories_vr.dm" +#include "code\modules\mob\new_player\sprite_accessories_wing.dm" +#include "code\modules\mob\new_player\sprite_accessories_wing_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\modular_computers\laptop_vendor.dm" #include "code\modules\modular_computers\computers\modular_computer\core.dm" #include "code\modules\modular_computers\computers\modular_computer\damage.dm" @@ -3483,6 +4132,10 @@ #include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm" #include "code\modules\multi-tile\multi-tile.dm" #include "code\modules\multiz\_stubs.dm" +<<<<<<< HEAD +======= +#include "code\modules\multiz\admin_upload.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\multiz\basic.dm" #include "code\modules\multiz\hoist.dm" #include "code\modules\multiz\ladder_assembly_vr.dm" @@ -3494,6 +4147,7 @@ #include "code\modules\multiz\portals_vr.dm" #include "code\modules\multiz\stairs.dm" #include "code\modules\multiz\turf.dm" +<<<<<<< HEAD #include "code\modules\multiz\turf_yw.dm" #include "code\modules\nano\nanoexternal.dm" #include "code\modules\nano\nanomanager.dm" @@ -3514,6 +4168,8 @@ #include "code\modules\nano\interaction\remote.dm" #include "code\modules\nano\interaction\self.dm" #include "code\modules\nano\interaction\zlevel.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\news\news_init.dm" #include "code\modules\news\newspaper.dm" #include "code\modules\news\newspaper_layout.dm" @@ -3534,6 +4190,7 @@ #include "code\modules\organs\organ_external.dm" #include "code\modules\organs\organ_external_vr.dm" #include "code\modules\organs\organ_icon.dm" +<<<<<<< HEAD #include "code\modules\organs\organ_icon_ch.dm" #include "code\modules\organs\organ_stump.dm" #include "code\modules\organs\pain.dm" @@ -3542,6 +4199,13 @@ #include "code\modules\organs\robolimbs_custom.dm" #include "code\modules\organs\robolimbs_vr.dm" #include "code\modules\organs\robolimbs_yw.dm" +======= +#include "code\modules\organs\organ_stump.dm" +#include "code\modules\organs\pain.dm" +#include "code\modules\organs\robolimbs.dm" +#include "code\modules\organs\robolimbs_custom.dm" +#include "code\modules\organs\robolimbs_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\organs\wound.dm" #include "code\modules\organs\internal\_organ_internal.dm" #include "code\modules\organs\internal\appendix.dm" @@ -3553,7 +4217,10 @@ #include "code\modules\organs\internal\kidneys.dm" #include "code\modules\organs\internal\liver.dm" #include "code\modules\organs\internal\lungs.dm" +<<<<<<< HEAD #include "code\modules\organs\internal\lungs_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\organs\internal\spleen.dm" #include "code\modules\organs\internal\stomach.dm" #include "code\modules\organs\internal\voicebox.dm" @@ -3626,7 +4293,10 @@ #include "code\modules\paperwork\paper.dm" #include "code\modules\paperwork\paper_bundle.dm" #include "code\modules\paperwork\paper_sticky.dm" +<<<<<<< HEAD #include "code\modules\paperwork\paper_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\paperwork\paperbin.dm" #include "code\modules\paperwork\paperplane.dm" #include "code\modules\paperwork\papershredder.dm" @@ -3652,7 +4322,10 @@ #include "code\modules\persistence\filth.dm" #include "code\modules\persistence\graffiti.dm" #include "code\modules\persistence\noticeboard.dm" +<<<<<<< HEAD #include "code\modules\persistence\noticeboard_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\persistence\paintings.dm" #include "code\modules\persistence\serialize.dm" #include "code\modules\persistence\datum\persistence_datum.dm" @@ -3664,9 +4337,16 @@ #include "code\modules\persistence\storage\smartfridge.dm" #include "code\modules\persistence\storage\storage.dm" #include "code\modules\planet\planet.dm" +<<<<<<< HEAD #include "code\modules\planet\sif.dm" #include "code\modules\planet\sun.dm" #include "code\modules\planet\time.dm" +======= +#include "code\modules\planet\sun.dm" +#include "code\modules\planet\time.dm" +#include "code\modules\planet\virgo3b_vr.dm" +#include "code\modules\planet\virgo4_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\planet\weather.dm" #include "code\modules\planet\weather_vr.dm" #include "code\modules\power\apc.dm" @@ -3680,7 +4360,10 @@ #include "code\modules\power\cell.dm" #include "code\modules\power\debug_items.dm" #include "code\modules\power\generator.dm" +<<<<<<< HEAD #include "code\modules\power\generator_yw.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\power\gravitygenerator_vr.dm" #include "code\modules\power\grid_checker.dm" #include "code\modules\power\lighting.dm" @@ -3713,7 +4396,10 @@ #include "code\modules\power\fusion\core\core_control.dm" #include "code\modules\power\fusion\core\core_field.dm" #include "code\modules\power\fusion\fuel_assembly\fuel_assembly.dm" +<<<<<<< HEAD #include "code\modules\power\fusion\fuel_assembly\fuel_assembly_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\power\fusion\fuel_assembly\fuel_compressor.dm" #include "code\modules\power\fusion\fuel_assembly\fuel_control.dm" #include "code\modules\power\fusion\fuel_assembly\fuel_injector.dm" @@ -3748,6 +4434,7 @@ #include "code\modules\projectiles\broken.dm" #include "code\modules\projectiles\dnalocking.dm" #include "code\modules\projectiles\gun.dm" +<<<<<<< HEAD #include "code\modules\projectiles\gun_ch.dm" #include "code\modules\projectiles\projectile.dm" #include "code\modules\projectiles\projectile_ch.dm" @@ -3762,6 +4449,15 @@ #include "code\modules\projectiles\ammunition\zz_autolathe_ch.dm" #include "code\modules\projectiles\ammunition\zz_magazines_ch.dm" #include "code\modules\projectiles\ammunition\zz_rounds_ch.dm" +======= +#include "code\modules\projectiles\projectile.dm" +#include "code\modules\projectiles\ammunition\ammo_boxes.dm" +#include "code\modules\projectiles\ammunition\magazines.dm" +#include "code\modules\projectiles\ammunition\magazines_vr.dm" +#include "code\modules\projectiles\ammunition\magnetic.dm" +#include "code\modules\projectiles\ammunition\rounds.dm" +#include "code\modules\projectiles\ammunition\smartmag.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\brokenguns\energy.dm" #include "code\modules\projectiles\brokenguns\launcher.dm" #include "code\modules\projectiles\brokenguns\magnetic.dm" @@ -3771,7 +4467,11 @@ #include "code\modules\projectiles\guns\magic.dm" #include "code\modules\projectiles\guns\modular_guns.dm" #include "code\modules\projectiles\guns\projectile.dm" +<<<<<<< HEAD #include "code\modules\projectiles\guns\projectile_ch.dm" +======= +#include "code\modules\projectiles\guns\toy.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\vox.dm" #include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm" #include "code\modules\projectiles\guns\energy\crestrose_vr.dm" @@ -3780,6 +4480,7 @@ #include "code\modules\projectiles\guns\energy\hooklauncher.dm" #include "code\modules\projectiles\guns\energy\kinetic_accelerator_vr.dm" #include "code\modules\projectiles\guns\energy\laser.dm" +<<<<<<< HEAD #include "code\modules\projectiles\guns\energy\laser_ch.dm" #include "code\modules\projectiles\guns\energy\laser_vr.dm" #include "code\modules\projectiles\guns\energy\laser_yw.dm" @@ -3787,6 +4488,12 @@ #include "code\modules\projectiles\guns\energy\netgun_yw.dm" #include "code\modules\projectiles\guns\energy\nuclear.dm" #include "code\modules\projectiles\guns\energy\nuclear_yw.dm" +======= +#include "code\modules\projectiles\guns\energy\laser_vr.dm" +#include "code\modules\projectiles\guns\energy\netgun_vr.dm" +#include "code\modules\projectiles\guns\energy\nuclear.dm" +#include "code\modules\projectiles\guns\energy\nuclear_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\energy\particle.dm" #include "code\modules\projectiles\guns\energy\phase.dm" #include "code\modules\projectiles\guns\energy\protector_vr.dm" @@ -3799,6 +4506,7 @@ #include "code\modules\projectiles\guns\energy\stun_vr.dm" #include "code\modules\projectiles\guns\energy\temperature.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\cell_loaded.dm" +<<<<<<< HEAD #include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon_cells.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nerd.dm" @@ -3807,6 +4515,15 @@ #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw_cells.dm" #include "code\modules\projectiles\guns\launcher\bows.dm" #include "code\modules\projectiles\guns\launcher\confetti_ch.dm" +======= +#include "code\modules\projectiles\guns\energy\cell_loaded_vr\ml3m.dm" +#include "code\modules\projectiles\guns\energy\cell_loaded_vr\ml3m_cells.dm" +#include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon.dm" +#include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon_cells.dm" +#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw.dm" +#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw_cells.dm" +#include "code\modules\projectiles\guns\launcher\bows.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\launcher\crossbow.dm" #include "code\modules\projectiles\guns\launcher\grenade_launcher.dm" #include "code\modules\projectiles\guns\launcher\pneumatic.dm" @@ -3818,6 +4535,7 @@ #include "code\modules\projectiles\guns\magnetic\magnetic.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_construction.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_railgun.dm" +<<<<<<< HEAD #include "code\modules\projectiles\guns\magnetic\magnetic_railgun_ch.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_railgun_vr.dm" #include "code\modules\projectiles\guns\projectile\automatic.dm" @@ -3826,6 +4544,12 @@ #include "code\modules\projectiles\guns\projectile\automatic_yw.dm" #include "code\modules\projectiles\guns\projectile\boltaction.dm" #include "code\modules\projectiles\guns\projectile\boltaction_ch.dm" +======= +#include "code\modules\projectiles\guns\magnetic\magnetic_railgun_vr.dm" +#include "code\modules\projectiles\guns\projectile\automatic.dm" +#include "code\modules\projectiles\guns\projectile\automatic_vr.dm" +#include "code\modules\projectiles\guns\projectile\boltaction.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\projectile\boltaction_vr.dm" #include "code\modules\projectiles\guns\projectile\caseless.dm" #include "code\modules\projectiles\guns\projectile\contender.dm" @@ -3833,6 +4557,7 @@ #include "code\modules\projectiles\guns\projectile\dartgun_vr.dm" #include "code\modules\projectiles\guns\projectile\pistol.dm" #include "code\modules\projectiles\guns\projectile\pistol_vr.dm" +<<<<<<< HEAD #include "code\modules\projectiles\guns\projectile\pistol_yw.dm" #include "code\modules\projectiles\guns\projectile\revolver.dm" #include "code\modules\projectiles\guns\projectile\revolver_vr.dm" @@ -3859,12 +4584,34 @@ #include "code\modules\projectiles\projectile\energy_ch.dm" #include "code\modules\projectiles\projectile\energy_vr.dm" #include "code\modules\projectiles\projectile\energy_yw.dm" +======= +#include "code\modules\projectiles\guns\projectile\revolver.dm" +#include "code\modules\projectiles\guns\projectile\revolver_vr.dm" +#include "code\modules\projectiles\guns\projectile\semiauto.dm" +#include "code\modules\projectiles\guns\projectile\shotgun.dm" +#include "code\modules\projectiles\guns\projectile\shotgun_vr.dm" +#include "code\modules\projectiles\guns\projectile\smartgun.dm" +#include "code\modules\projectiles\guns\projectile\sniper.dm" +#include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm" +#include "code\modules\projectiles\projectile\arc.dm" +#include "code\modules\projectiles\projectile\beams.dm" +#include "code\modules\projectiles\projectile\beams_vr.dm" +#include "code\modules\projectiles\projectile\blob.dm" +#include "code\modules\projectiles\projectile\bullets.dm" +#include "code\modules\projectiles\projectile\bullets_vr.dm" +#include "code\modules\projectiles\projectile\change.dm" +#include "code\modules\projectiles\projectile\energy.dm" +#include "code\modules\projectiles\projectile\energy_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\projectile\explosive.dm" #include "code\modules\projectiles\projectile\force.dm" #include "code\modules\projectiles\projectile\hook.dm" #include "code\modules\projectiles\projectile\magic.dm" #include "code\modules\projectiles\projectile\magnetic.dm" +<<<<<<< HEAD #include "code\modules\projectiles\projectile\magnetic_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\projectile\pellets.dm" #include "code\modules\projectiles\projectile\scatter.dm" #include "code\modules\projectiles\projectile\special.dm" @@ -3896,7 +4643,10 @@ #include "code\modules\reagents\Chemistry-Metabolism.dm" #include "code\modules\reagents\holder\distilling.dm" #include "code\modules\reagents\holder\holder.dm" +<<<<<<< HEAD #include "code\modules\reagents\holder\holder_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\hoses\connector.dm" #include "code\modules\reagents\hoses\hose.dm" #include "code\modules\reagents\hoses\hose_connector.dm" @@ -3904,10 +4654,17 @@ #include "code\modules\reagents\machinery\chemalyzer.dm" #include "code\modules\reagents\machinery\distillery.dm" #include "code\modules\reagents\machinery\grinder.dm" +<<<<<<< HEAD #include "code\modules\reagents\machinery\dispenser\_defines.dm" #include "code\modules\reagents\machinery\dispenser\cartridge.dm" #include "code\modules\reagents\machinery\dispenser\cartridge_presets.dm" #include "code\modules\reagents\machinery\dispenser\cartridge_presets_ch.dm" +======= +#include "code\modules\reagents\machinery\pump.dm" +#include "code\modules\reagents\machinery\dispenser\_defines.dm" +#include "code\modules\reagents\machinery\dispenser\cartridge.dm" +#include "code\modules\reagents\machinery\dispenser\cartridge_presets.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\machinery\dispenser\cartridge_presets_vr.dm" #include "code\modules\reagents\machinery\dispenser\cartridge_spawn.dm" #include "code\modules\reagents\machinery\dispenser\dispenser2.dm" @@ -3915,12 +4672,16 @@ #include "code\modules\reagents\machinery\dispenser\dispenser_presets.dm" #include "code\modules\reagents\machinery\dispenser\dispenser_presets_vr.dm" #include "code\modules\reagents\machinery\dispenser\reagent_tank.dm" +<<<<<<< HEAD #include "code\modules\reagents\machinery\dispenser\reagent_tank_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\machinery\dispenser\supply.dm" #include "code\modules\reagents\reactions\_reactions.dm" #include "code\modules\reagents\reactions\distilling\distilling.dm" #include "code\modules\reagents\reactions\fusion\fusion.dm" #include "code\modules\reagents\reactions\instant\drinks.dm" +<<<<<<< HEAD #include "code\modules\reagents\reactions\instant\drinks_ch.dm" #include "code\modules\reagents\reactions\instant\drinks_vr.dm" #include "code\modules\reagents\reactions\instant\food.dm" @@ -3928,6 +4689,12 @@ #include "code\modules\reagents\reactions\instant\food_vr.dm" #include "code\modules\reagents\reactions\instant\instant.dm" #include "code\modules\reagents\reactions\instant\instant_ch.dm" +======= +#include "code\modules\reagents\reactions\instant\drinks_vr.dm" +#include "code\modules\reagents\reactions\instant\food.dm" +#include "code\modules\reagents\reactions\instant\food_vr.dm" +#include "code\modules\reagents\reactions\instant\instant.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\reactions\instant\instant_vr.dm" #include "code\modules\reagents\reagent_containers\_reagent_containers.dm" #include "code\modules\reagents\reagent_containers\blood_pack.dm" @@ -3946,12 +4713,16 @@ #include "code\modules\reagents\reagent_containers\syringes.dm" #include "code\modules\reagents\reagent_containers\syringes_vr.dm" #include "code\modules\reagents\reagent_containers\unidentified_hypospray.dm" +<<<<<<< HEAD #include "code\modules\reagents\reagent_containers\food\drinks\bluespacecoffee.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\reagents\_helpers.dm" #include "code\modules\reagents\reagents\_reagents.dm" #include "code\modules\reagents\reagents\core.dm" #include "code\modules\reagents\reagents\dispenser.dm" #include "code\modules\reagents\reagents\food_drinks.dm" +<<<<<<< HEAD #include "code\modules\reagents\reagents\food_drinks_ch.dm" #include "code\modules\reagents\reagents\food_drinks_vr.dm" #include "code\modules\reagents\reagents\medicine.dm" @@ -3963,6 +4734,15 @@ #include "code\modules\reagents\reagents\other_vr.dm" #include "code\modules\reagents\reagents\toxins.dm" #include "code\modules\reagents\reagents\vore_ch.dm" +======= +#include "code\modules\reagents\reagents\food_drinks_vr.dm" +#include "code\modules\reagents\reagents\medicine.dm" +#include "code\modules\reagents\reagents\medicine_vr.dm" +#include "code\modules\reagents\reagents\modifiers.dm" +#include "code\modules\reagents\reagents\other.dm" +#include "code\modules\reagents\reagents\other_vr.dm" +#include "code\modules\reagents\reagents\toxins.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\reagents\vore_vr.dm" #include "code\modules\recycling\conveyor2.dm" #include "code\modules\recycling\disposal-construction.dm" @@ -3973,7 +4753,10 @@ #include "code\modules\research\designs.dm" #include "code\modules\research\destructive_analyzer.dm" #include "code\modules\research\mechfab_designs.dm" +<<<<<<< HEAD #include "code\modules\research\mechfab_designs_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\research\message_server.dm" #include "code\modules\research\prosfab_designs.dm" #include "code\modules\research\prosfab_designs_vr.dm" @@ -4010,30 +4793,45 @@ #include "code\modules\research\designs\subspace_parts.dm" #include "code\modules\research\designs\tech_disks.dm" #include "code\modules\research\designs\weapons.dm" +<<<<<<< HEAD #include "code\modules\research\designs\weapons_ch.dm" #include "code\modules\research\designs\weapons_vr.dm" #include "code\modules\research\designs\weapons_yw.dm" +======= +#include "code\modules\research\designs\weapons_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\research\designs\xenoarch_toys.dm" #include "code\modules\research\designs\xenobio_toys.dm" #include "code\modules\research\designs\circuits\ai_modules.dm" #include "code\modules\research\designs\circuits\ai_modules_vr.dm" #include "code\modules\research\designs\circuits\circuits.dm" +<<<<<<< HEAD #include "code\modules\research\designs\circuits\circuits_ch.dm" #include "code\modules\research\designs\circuits\circuits_vr.dm" #include "code\modules\research\designs\circuits\circuits_yw.dm" +======= +#include "code\modules\research\designs\circuits\circuits_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\research\designs\circuits\disks.dm" #include "code\modules\resleeving\circuitboards.dm" #include "code\modules\resleeving\computers.dm" #include "code\modules\resleeving\designer.dm" #include "code\modules\resleeving\documents.dm" #include "code\modules\resleeving\implant.dm" +<<<<<<< HEAD #include "code\modules\resleeving\implant_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\resleeving\infocore_records.dm" #include "code\modules\resleeving\infomorph.dm" #include "code\modules\resleeving\infomorph_software.dm" #include "code\modules\resleeving\machine_subtypes.dm" #include "code\modules\resleeving\machines.dm" +<<<<<<< HEAD #include "code\modules\resleeving\machines_ch.dm" +======= +#include "code\modules\resleeving\resleeving_sickness.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\resleeving\sleevecard.dm" #include "code\modules\rogueminer_vr\asteroid.dm" #include "code\modules\rogueminer_vr\controller.dm" @@ -4083,7 +4881,10 @@ #include "code\modules\shuttles\escape_pods.dm" #include "code\modules\shuttles\landmarks.dm" #include "code\modules\shuttles\shuttle.dm" +<<<<<<< HEAD #include "code\modules\shuttles\shuttle_arrivals.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\shuttles\shuttle_autodock.dm" #include "code\modules\shuttles\shuttle_console.dm" #include "code\modules\shuttles\shuttle_console_multi.dm" @@ -4153,7 +4954,10 @@ #include "code\modules\telesci\bscyrstal.dm" #include "code\modules\telesci\construction.dm" #include "code\modules\telesci\gps_advanced.dm" +<<<<<<< HEAD #include "code\modules\telesci\hyper_pad_ch.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\telesci\quantum_pad.dm" #include "code\modules\telesci\telepad.dm" #include "code\modules\telesci\telesci_computer.dm" @@ -4227,7 +5031,10 @@ #include "code\modules\vehicles\cargo_train.dm" #include "code\modules\vehicles\construction.dm" #include "code\modules\vehicles\quad.dm" +<<<<<<< HEAD #include "code\modules\vehicles\Securitrain_vr.dm" +======= +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\vehicles\train.dm" #include "code\modules\vehicles\vehicle.dm" #include "code\modules\ventcrawl\ventcrawl.dm" @@ -4250,16 +5057,22 @@ #include "code\modules\vore\hook-defs_vr.dm" #include "code\modules\vore\trycatch_vr.dm" #include "code\modules\vore\appearance\preferences_vr.dm" +<<<<<<< HEAD #include "code\modules\vore\appearance\sprite_accessories_taur_yw.dm" #include "code\modules\vore\appearance\sprite_accessories_yw.dm" #include "code\modules\vore\appearance\update_icons_vr.dm" #include "code\modules\vore\eating\belly_dat_vr.dm" #include "code\modules\vore\eating\belly_obj_ch.dm" +======= +#include "code\modules\vore\appearance\update_icons_vr.dm" +#include "code\modules\vore\eating\belly_dat_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\vore\eating\belly_obj_vr.dm" #include "code\modules\vore\eating\bellymodes_datum_vr.dm" #include "code\modules\vore\eating\bellymodes_vr.dm" #include "code\modules\vore\eating\contaminate_vr.dm" #include "code\modules\vore\eating\digest_act_vr.dm" +<<<<<<< HEAD #include "code\modules\vore\eating\leave_remains_vr.dm" #include "code\modules\vore\eating\living_ch.dm" #include "code\modules\vore\eating\living_vr.dm" @@ -4288,6 +5101,24 @@ #include "code\modules\vore\persist\persist_vr.dm" #include "code\modules\vore\resizing\grav_pull_vr.dm" #include "code\modules\vore\resizing\holder_micro_ch.dm" +======= +#include "code\modules\vore\eating\inbelly_spawn.dm" +#include "code\modules\vore\eating\leave_remains_vr.dm" +#include "code\modules\vore\eating\living_vr.dm" +#include "code\modules\vore\eating\silicon_vr.dm" +#include "code\modules\vore\eating\simple_animal_vr.dm" +#include "code\modules\vore\eating\transforming_vr.dm" +#include "code\modules\vore\eating\vore_vr.dm" +#include "code\modules\vore\eating\vorehooks_vr.dm" +#include "code\modules\vore\eating\vorepanel_vr.dm" +#include "code\modules\vore\fluffstuff\custom_boxes_vr.dm" +#include "code\modules\vore\fluffstuff\custom_clothes_vr.dm" +#include "code\modules\vore\fluffstuff\custom_items_vr.dm" +#include "code\modules\vore\fluffstuff\custom_mecha_vr.dm" +#include "code\modules\vore\fluffstuff\custom_permits_vr.dm" +#include "code\modules\vore\persist\persist_vr.dm" +#include "code\modules\vore\resizing\grav_pull_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\vore\resizing\holder_micro_vr.dm" #include "code\modules\vore\resizing\resize_vr.dm" #include "code\modules\vore\resizing\sizegun_vr.dm" @@ -4303,6 +5134,10 @@ #include "code\modules\xenoarcheaology\anomaly_container.dm" #include "code\modules\xenoarcheaology\boulder.dm" #include "code\modules\xenoarcheaology\effect.dm" +<<<<<<< HEAD +======= +#include "code\modules\xenoarcheaology\effect_master.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\xenoarcheaology\manuals.dm" #include "code\modules\xenoarcheaology\misc.dm" #include "code\modules\xenoarcheaology\sampling.dm" @@ -4348,7 +5183,11 @@ #include "code\modules\xenoarcheaology\effects\teleport.dm" #include "code\modules\xenoarcheaology\effects\vampire.dm" #include "code\modules\xenoarcheaology\finds\eguns.dm" +<<<<<<< HEAD #include "code\modules\xenoarcheaology\finds\eguns_vr_ch.dm" +======= +#include "code\modules\xenoarcheaology\finds\eguns_vr.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\xenoarcheaology\finds\find_spawning.dm" #include "code\modules\xenoarcheaology\finds\finds.dm" #include "code\modules\xenoarcheaology\finds\finds_defines.dm" @@ -4409,16 +5248,24 @@ #include "code\ZAS\Zone.dm" #include "interface\interface.dm" #include "interface\skin.dmf" +<<<<<<< HEAD #include "maps\gateway_archive_vr\blackmarketpackers.dm" #include "maps\southern_cross\southern_cross.dm" #include "maps\southern_cross\items\encryptionkey_sc.dm" #include "maps\southern_cross\items\headset_sc.dm" +======= +#include "maps\expedition_vr\beach\submaps\mountains.dm" +#include "maps\expedition_vr\beach\submaps\mountains_areas.dm" +#include "maps\gateway_archive_vr\blackmarketpackers.dm" +#include "maps\offmap_vr\om_ships\abductor.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" #include "maps\southern_cross\items\clothing\sc_under.dm" #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" +<<<<<<< HEAD #include "maps\southern_cross\overmap\shuttles.dm" #include "maps\southern_cross\structures\closets\engineering.dm" #include "maps\southern_cross\structures\closets\medical.dm" @@ -4426,10 +5273,16 @@ #include "maps\southern_cross\structures\closets\research.dm" #include "maps\southern_cross\structures\closets\security.dm" #include "maps\submaps\_helpers.dm" +======= +#include "maps\stellardelight\stellar_delight.dm" +#include "maps\submaps\_helpers.dm" +#include "maps\submaps\_readme.dm" +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "maps\submaps\engine_submaps\engine.dm" #include "maps\submaps\engine_submaps\engine_areas.dm" #include "maps\submaps\engine_submaps_vr\tether\_engine_submaps.dm" #include "maps\submaps\space_submaps\space.dm" +<<<<<<< HEAD #include "maps\submaps\space_submaps\space_areas.dm" #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\mountains\mountains.dm" @@ -4441,3 +5294,10 @@ #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE +======= +#include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" +#include "maps\submaps\surface_submaps\wilderness\wilderness.dm" +#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" +#include "maps\~map_system\maps.dm" +// END_INCLUDE +>>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix From fd32b2dc4e1ce9da8688118596433835ccbd0408 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Mon, 28 Feb 2022 23:08:39 -0700 Subject: [PATCH 2/3] powder that makes you say yes --- vorestation.dme | 862 +----------------------------------------------- 1 file changed, 3 insertions(+), 859 deletions(-) diff --git a/vorestation.dme b/vorestation.dme index 752f2def54..7ae79d8606 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -16,25 +16,16 @@ #include "code\_map_tests.dm" #include "code\_unit_tests.dm" #include "code\global.dm" -<<<<<<< HEAD #include "code\global_ch.dm" #include "code\global_init.dm" #include "code\global_vr.dm" #include "code\global_yw.dm" -======= -#include "code\global_init.dm" -#include "code\global_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\hub.dm" #include "code\names.dm" #include "code\stylesheet.dm" #include "code\world.dm" #include "code\__datastructures\globals.dm" #include "code\__defines\__513_compatibility.dm" -<<<<<<< HEAD -======= -#include "code\__defines\__outdated_compatibility.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\_compile_options.dm" #include "code\__defines\_lists.dm" #include "code\__defines\_planes+layers.dm" @@ -45,10 +36,7 @@ #include "code\__defines\admin_vr.dm" #include "code\__defines\appearance.dm" #include "code\__defines\atmos.dm" -<<<<<<< HEAD #include "code\__defines\belly_modes_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\belly_modes_vr.dm" #include "code\__defines\callbacks.dm" #include "code\__defines\chemistry.dm" @@ -78,17 +66,11 @@ #include "code\__defines\math_physics.dm" #include "code\__defines\MC.dm" #include "code\__defines\misc.dm" -<<<<<<< HEAD #include "code\__defines\misc_ch.dm" #include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" #include "code\__defines\mobs_vr.dm" #include "code\__defines\mobs_yw.dm" -======= -#include "code\__defines\misc_vr.dm" -#include "code\__defines\mobs.dm" -#include "code\__defines\mobs_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\nifsoft.dm" #include "code\__defines\objects.dm" #include "code\__defines\overmap.dm" @@ -108,10 +90,7 @@ #include "code\__defines\spaceman_dmm.dm" #include "code\__defines\species_languages.dm" #include "code\__defines\species_languages_vr.dm" -<<<<<<< HEAD #include "code\__defines\species_languages_YW.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\__defines\sprite_sheets.dm" #include "code\__defines\sqlite_defines.dm" #include "code\__defines\stat_tracking.dm" @@ -152,10 +131,7 @@ #include "code\_helpers\files.dm" #include "code\_helpers\game.dm" #include "code\_helpers\global_lists.dm" -<<<<<<< HEAD #include "code\_helpers\global_lists_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_helpers\global_lists_vr.dm" #include "code\_helpers\icons.dm" #include "code\_helpers\icons_vr.dm" @@ -172,18 +148,12 @@ #include "code\_helpers\time.dm" #include "code\_helpers\turfs.dm" #include "code\_helpers\type2type.dm" -<<<<<<< HEAD #include "code\_helpers\typelists.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_helpers\unsorted.dm" #include "code\_helpers\unsorted_vr.dm" #include "code\_helpers\view.dm" #include "code\_helpers\visual_filters.dm" -<<<<<<< HEAD #include "code\_helpers\widelists_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_helpers\sorts\__main.dm" #include "code\_helpers\sorts\comparators.dm" #include "code\_helpers\sorts\TimSort.dm" @@ -224,10 +194,7 @@ #include "code\_onclick\hud\robot_vr.dm" #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screen_objects_vr.dm" -<<<<<<< HEAD #include "code\_onclick\hud\screen_objects_zz_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\_onclick\hud\skybox.dm" #include "code\_onclick\hud\soulcatcher_guest.dm" #include "code\_onclick\hud\spell_screen_objects.dm" @@ -259,10 +226,7 @@ #include "code\ATMOSPHERICS\components\unary\cold_sink.dm" #include "code\ATMOSPHERICS\components\unary\heat_exchanger.dm" #include "code\ATMOSPHERICS\components\unary\heat_source.dm" -<<<<<<< HEAD #include "code\ATMOSPHERICS\components\unary\heat_source_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\ATMOSPHERICS\components\unary\outlet_injector.dm" #include "code\ATMOSPHERICS\components\unary\unary_base.dm" #include "code\ATMOSPHERICS\components\unary\vent_pump.dm" @@ -283,10 +247,7 @@ #include "code\controllers\autotransfer.dm" #include "code\controllers\communications.dm" #include "code\controllers\configuration.dm" -<<<<<<< HEAD #include "code\controllers\configuration_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\configuration_vr.dm" #include "code\controllers\controller.dm" #include "code\controllers\emergency_shuttle_controller.dm" @@ -310,13 +271,9 @@ #include "code\controllers\subsystems\chat.dm" #include "code\controllers\subsystems\chemistry.dm" #include "code\controllers\subsystems\circuits.dm" -<<<<<<< HEAD #include "code\controllers\subsystems\dbcore.dm" #include "code\controllers\subsystems\dcs.dm" #include "code\controllers\subsystems\discord.dm" -======= -#include "code\controllers\subsystems\dcs.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\subsystems\events.dm" #include "code\controllers\subsystems\garbage.dm" #include "code\controllers\subsystems\holomaps.dm" @@ -328,10 +285,7 @@ #include "code\controllers\subsystems\mapping.dm" #include "code\controllers\subsystems\media_tracks.dm" #include "code\controllers\subsystems\mobs.dm" -<<<<<<< HEAD #include "code\controllers\subsystems\nanoui.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\subsystems\nightshift.dm" #include "code\controllers\subsystems\orbits.dm" #include "code\controllers\subsystems\overlays.dm" @@ -340,10 +294,7 @@ #include "code\controllers\subsystems\planets.dm" #include "code\controllers\subsystems\plants.dm" #include "code\controllers\subsystems\radiation.dm" -<<<<<<< HEAD #include "code\controllers\subsystems\reflect_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\controllers\subsystems\shuttles.dm" #include "code\controllers\subsystems\skybox.dm" #include "code\controllers\subsystems\sounds.dm" @@ -370,10 +321,7 @@ #include "code\datums\ai_law_sets.dm" #include "code\datums\ai_law_sets_vr.dm" #include "code\datums\ai_laws.dm" -<<<<<<< HEAD #include "code\datums\api.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\beam.dm" #include "code\datums\browser.dm" #include "code\datums\callback.dm" @@ -387,10 +335,6 @@ #include "code\datums\ghost_query_vr.dm" #include "code\datums\hierarchy.dm" #include "code\datums\mind.dm" -<<<<<<< HEAD -======= -#include "code\datums\mind_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\mixed.dm" #include "code\datums\modules.dm" #include "code\datums\mutable_appearance.dm" @@ -405,10 +349,7 @@ #include "code\datums\weakref.dm" #include "code\datums\autolathe\arms.dm" #include "code\datums\autolathe\arms_vr.dm" -<<<<<<< HEAD #include "code\datums\autolathe\arms_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\autolathe\autolathe.dm" #include "code\datums\autolathe\devices.dm" #include "code\datums\autolathe\devices_vr.dm" @@ -502,10 +443,7 @@ #include "code\datums\outfits\jobs\science.dm" #include "code\datums\outfits\jobs\science_vr.dm" #include "code\datums\outfits\jobs\security.dm" -<<<<<<< HEAD #include "code\datums\outfits\jobs\security_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\outfits\jobs\special_vr.dm" #include "code\datums\outfits\military\fleet.dm" #include "code\datums\outfits\military\marines.dm" @@ -532,13 +470,9 @@ #include "code\datums\supplypacks\hydroponics.dm" #include "code\datums\supplypacks\hydroponics_vr.dm" #include "code\datums\supplypacks\materials.dm" -<<<<<<< HEAD #include "code\datums\supplypacks\materials_yw.dm" #include "code\datums\supplypacks\medical.dm" #include "code\datums\supplypacks\medical_ch.dm" -======= -#include "code\datums\supplypacks\medical.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\supplypacks\medical_vr.dm" #include "code\datums\supplypacks\misc.dm" #include "code\datums\supplypacks\misc_vr.dm" @@ -547,20 +481,14 @@ #include "code\datums\supplypacks\musical.dm" #include "code\datums\supplypacks\recreation.dm" #include "code\datums\supplypacks\recreation_vr.dm" -<<<<<<< HEAD #include "code\datums\supplypacks\recreation_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\supplypacks\robotics.dm" #include "code\datums\supplypacks\robotics_vr.dm" #include "code\datums\supplypacks\science.dm" #include "code\datums\supplypacks\science_vr.dm" #include "code\datums\supplypacks\security.dm" #include "code\datums\supplypacks\security_vr.dm" -<<<<<<< HEAD #include "code\datums\supplypacks\security_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\datums\supplypacks\supply.dm" #include "code\datums\supplypacks\supply_vr.dm" #include "code\datums\supplypacks\supplypacks.dm" @@ -620,10 +548,6 @@ #include "code\defines\obj\weapon.dm" #include "code\defines\procs\announce.dm" #include "code\defines\procs\AStar.dm" -<<<<<<< HEAD -======= -#include "code\defines\procs\dbcore.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\defines\procs\radio.dm" #include "code\defines\procs\statistics.dm" #include "code\game\atoms.dm" @@ -676,26 +600,17 @@ #include "code\game\antagonist\station\traitor.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" -<<<<<<< HEAD #include "code\game\area\areas_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\area\areas_vr.dm" #include "code\game\area\asteroid_areas.dm" #include "code\game\area\Away Mission areas.dm" #include "code\game\area\CC_areas_vr.dm" #include "code\game\area\Space Station 13 areas.dm" -<<<<<<< HEAD #include "code\game\area\Space Station 13 areas_ch.dm" #include "code\game\area\Space Station 13 areas_vr.dm" #include "code\game\area\ss13_deprecated_areas.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_ch.dm" -======= -#include "code\game\area\Space Station 13 areas_vr.dm" -#include "code\game\area\ss13_deprecated_areas.dm" -#include "code\game\dna\dna2.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\dna\dna2_domutcheck.dm" #include "code\game\dna\dna2_helpers.dm" #include "code\game\dna\dna_modifier.dm" @@ -807,10 +722,7 @@ #include "code\game\gamemodes\technomancer\clothing.dm" #include "code\game\gamemodes\technomancer\core_obj.dm" #include "code\game\gamemodes\technomancer\equipment.dm" -<<<<<<< HEAD #include "code\game\gamemodes\technomancer\equipment_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\gamemodes\technomancer\instability.dm" #include "code\game\gamemodes\technomancer\spell_objs.dm" #include "code\game\gamemodes\technomancer\spell_objs_helpers.dm" @@ -905,10 +817,7 @@ #include "code\game\jobs\job\job.dm" #include "code\game\jobs\job\job_vr.dm" #include "code\game\jobs\job\medical.dm" -<<<<<<< HEAD #include "code\game\jobs\job\medical_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\jobs\job\medical_vr.dm" #include "code\game\jobs\job\offduty_vr.dm" #include "code\game\jobs\job\science.dm" @@ -918,19 +827,13 @@ #include "code\game\jobs\job\silicon.dm" #include "code\game\jobs\job\silicon_vr.dm" #include "code\game\jobs\job\special_vr.dm" -<<<<<<< HEAD #include "code\game\jobs\job\zz_alt_titles_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\adv_med.dm" #include "code\game\machinery\adv_med_vr.dm" #include "code\game\machinery\ai_slipper.dm" #include "code\game\machinery\air_alarm.dm" #include "code\game\machinery\airconditioner_vr.dm" -<<<<<<< HEAD #include "code\game\machinery\airconditioner_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\atm_ret_field.dm" #include "code\game\machinery\atmo_control.dm" #include "code\game\machinery\autolathe.dm" @@ -941,14 +844,9 @@ #include "code\game\machinery\buttons.dm" #include "code\game\machinery\buttons_vr.dm" #include "code\game\machinery\CableLayer.dm" -<<<<<<< HEAD #include "code\game\machinery\casino_ch.dm" #include "code\game\machinery\casino_prize_dispenser_ch.dm" #include "code\game\machinery\cell_charger.dm" -======= -#include "code\game\machinery\cell_charger.dm" -#include "code\game\machinery\clawmachine.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\cloning.dm" #include "code\game\machinery\cryo.dm" #include "code\game\machinery\cryopod.dm" @@ -959,10 +857,7 @@ #include "code\game\machinery\doorbell_vr.dm" #include "code\game\machinery\doppler_array.dm" #include "code\game\machinery\exonet_node.dm" -<<<<<<< HEAD #include "code\game\machinery\feeder.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\fire_alarm.dm" #include "code\game\machinery\flasher.dm" #include "code\game\machinery\floodlight.dm" @@ -976,10 +871,7 @@ #include "code\game\machinery\igniter.dm" #include "code\game\machinery\iv_drip.dm" #include "code\game\machinery\jukebox.dm" -<<<<<<< HEAD #include "code\game\machinery\jukebox_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\lightswitch.dm" #include "code\game\machinery\machinery.dm" #include "code\game\machinery\machinery_power.dm" @@ -1012,25 +904,16 @@ #include "code\game\machinery\suit_cycler_datums.dm" #include "code\game\machinery\suit_storage_unit.dm" #include "code\game\machinery\suit_storage_unit_vr.dm" -<<<<<<< HEAD #include "code\game\machinery\suit_storage_unit_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\supply_display.dm" #include "code\game\machinery\supplybeacon.dm" #include "code\game\machinery\syndicatebeacon.dm" #include "code\game\machinery\syndicatebeacon_vr.dm" -<<<<<<< HEAD #include "code\game\machinery\telecrystal_storage_ch.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transportpod.dm" #include "code\game\machinery\turret_control.dm" #include "code\game\machinery\vending_yw.dm" -======= -#include "code\game\machinery\teleporter.dm" -#include "code\game\machinery\transportpod.dm" -#include "code\game\machinery\turret_control.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\vitals_monitor.dm" #include "code\game\machinery\wall_frames.dm" #include "code\game\machinery\washing_machine.dm" @@ -1087,29 +970,20 @@ #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_angled_bay.dm" #include "code\game\machinery\doors\airlock_angled_tgmc.dm" -<<<<<<< HEAD #include "code\game\machinery\doors\airlock_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\doors\airlock_control.dm" #include "code\game\machinery\doors\airlock_electronics.dm" #include "code\game\machinery\doors\airlock_vr.dm" #include "code\game\machinery\doors\alarmlock.dm" #include "code\game\machinery\doors\blast_door.dm" -<<<<<<< HEAD #include "code\game\machinery\doors\blast_door_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\doors\brigdoors.dm" #include "code\game\machinery\doors\checkForMultipleDoors.dm" #include "code\game\machinery\doors\door.dm" #include "code\game\machinery\doors\door_vr.dm" #include "code\game\machinery\doors\firedoor.dm" #include "code\game\machinery\doors\firedoor_assembly.dm" -<<<<<<< HEAD #include "code\game\machinery\doors\firedoor_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\doors\firedoor_vr.dm" #include "code\game\machinery\doors\multi_tile.dm" #include "code\game\machinery\doors\multi_tile_vr.dm" @@ -1125,30 +999,18 @@ #include "code\game\machinery\embedded_controller\embedded_program_base.dm" #include "code\game\machinery\embedded_controller\mapping_helpers.dm" #include "code\game\machinery\embedded_controller\simple_docking_controller.dm" -<<<<<<< HEAD #include "code\game\machinery\event\christmas_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\event\stage_vr.dm" #include "code\game\machinery\pipe\construction.dm" #include "code\game\machinery\pipe\pipe_dispenser.dm" #include "code\game\machinery\pipe\pipe_recipes.dm" #include "code\game\machinery\pipe\pipelayer.dm" -<<<<<<< HEAD -#include "code\game\machinery\reagents\pump.dm" #include "code\game\machinery\telecomms\broadcaster.dm" #include "code\game\machinery\telecomms\broadcaster_ch.dm" #include "code\game\machinery\telecomms\logbrowser.dm" #include "code\game\machinery\telecomms\machine_interactions.dm" #include "code\game\machinery\telecomms\presets.dm" #include "code\game\machinery\telecomms\presets_ch.dm" -======= -#include "code\game\machinery\telecomms\broadcaster.dm" -#include "code\game\machinery\telecomms\broadcaster_vr.dm" -#include "code\game\machinery\telecomms\logbrowser.dm" -#include "code\game\machinery\telecomms\machine_interactions.dm" -#include "code\game\machinery\telecomms\presets.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\machinery\telecomms\presets_vr.dm" #include "code\game\machinery\telecomms\telecomunications.dm" #include "code\game\machinery\telecomms\telemonitor.dm" @@ -1164,7 +1026,6 @@ #include "code\game\mecha\mecha_actions.dm" #include "code\game\mecha\mecha_appearance.dm" #include "code\game\mecha\mecha_construction_paths.dm" -<<<<<<< HEAD #include "code\game\mecha\mecha_construction_paths_ch.dm" #include "code\game\mecha\mecha_control_console.dm" #include "code\game\mecha\mecha_helpers.dm" @@ -1173,13 +1034,6 @@ #include "code\game\mecha\mecha_vr.dm" #include "code\game\mecha\mecha_wreckage.dm" #include "code\game\mecha\mecha_wreckage_ch.dm" -======= -#include "code\game\mecha\mecha_control_console.dm" -#include "code\game\mecha\mecha_helpers.dm" -#include "code\game\mecha\mecha_parts.dm" -#include "code\game\mecha\mecha_vr.dm" -#include "code\game\mecha\mecha_wreckage.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\mecha\combat\combat.dm" #include "code\game\mecha\combat\durand.dm" #include "code\game\mecha\combat\fighter.dm" @@ -1187,10 +1041,7 @@ #include "code\game\mecha\combat\gygax.dm" #include "code\game\mecha\combat\marauder.dm" #include "code\game\mecha\combat\phazon.dm" -<<<<<<< HEAD #include "code\game\mecha\combat\scarab_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\mecha\components\_component.dm" #include "code\game\mecha\components\actuators.dm" #include "code\game\mecha\components\armor.dm" @@ -1215,10 +1066,7 @@ #include "code\game\mecha\equipment\tools\medigun_vr.dm" #include "code\game\mecha\equipment\tools\orescanner.dm" #include "code\game\mecha\equipment\tools\passenger.dm" -<<<<<<< HEAD #include "code\game\mecha\equipment\tools\phoron_bore_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\mecha\equipment\tools\powertool.dm" #include "code\game\mecha\equipment\tools\rcd.dm" #include "code\game\mecha\equipment\tools\repair_droid.dm" @@ -1273,28 +1121,19 @@ #include "code\game\objects\explosion.dm" #include "code\game\objects\explosion_recursive.dm" #include "code\game\objects\items.dm" -<<<<<<< HEAD #include "code\game\objects\kasscbuttons_ch.dm" #include "code\game\objects\mob_spawner_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\mob_spawner_vr.dm" #include "code\game\objects\objs.dm" #include "code\game\objects\structures.dm" #include "code\game\objects\stumble_into_vr.dm" #include "code\game\objects\weapons.dm" -<<<<<<< HEAD #include "code\game\objects\effects\blockers_yw.dm" #include "code\game\objects\effects\bluespace_spawner_ch.dm" #include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\confetti_vr.dm" #include "code\game\objects\effects\effect_system.dm" #include "code\game\objects\effects\effect_system_ch.dm" -======= -#include "code\game\objects\effects\bump_teleporter.dm" -#include "code\game\objects\effects\confetti_vr.dm" -#include "code\game\objects\effects\effect_system.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\effects\explosion_particles.dm" #include "code\game\objects\effects\gibs.dm" #include "code\game\objects\effects\glowshroom.dm" @@ -1312,11 +1151,8 @@ #include "code\game\objects\effects\spiders_vr.dm" #include "code\game\objects\effects\step_triggers.dm" #include "code\game\objects\effects\zone_divider.dm" -<<<<<<< HEAD #include "code\game\objects\effects\zz_portals_ch.dm" #include "code\game\objects\effects\zz_triggers_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\effects\alien\aliens.dm" #include "code\game\objects\effects\chem\chemsmoke.dm" #include "code\game\objects\effects\chem\coating.dm" @@ -1332,10 +1168,7 @@ #include "code\game\objects\effects\decals\Cleanable\fuel.dm" #include "code\game\objects\effects\decals\Cleanable\humans.dm" #include "code\game\objects\effects\decals\Cleanable\misc.dm" -<<<<<<< HEAD #include "code\game\objects\effects\decals\Cleanable\reagent_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\effects\decals\Cleanable\robots.dm" #include "code\game\objects\effects\decals\Cleanable\tracks.dm" #include "code\game\objects\effects\decals\posters\bs12.dm" @@ -1381,13 +1214,9 @@ #include "code\game\objects\items\pizza_voucher_vr.dm" #include "code\game\objects\items\poi_items.dm" #include "code\game\objects\items\robobag.dm" -<<<<<<< HEAD #include "code\game\objects\items\sahoc_ch.dm" #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\surplus_voucher_ch.dm" -======= -#include "code\game\objects\items\shooting_range.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\tailoring.dm" #include "code\game\objects\items\trash.dm" #include "code\game\objects\items\trash_material.dm" @@ -1416,19 +1245,13 @@ #include "code\game\objects\items\devices\modkit.dm" #include "code\game\objects\items\devices\multitool.dm" #include "code\game\objects\items\devices\paicard.dm" -<<<<<<< HEAD #include "code\game\objects\items\devices\paicard_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\pipe_painter.dm" #include "code\game\objects\items\devices\powersink.dm" #include "code\game\objects\items\devices\scanners.dm" #include "code\game\objects\items\devices\scanners_vr.dm" #include "code\game\objects\items\devices\spy_bug.dm" -<<<<<<< HEAD #include "code\game\objects\items\devices\starcaster_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\suit_cooling.dm" #include "code\game\objects\items\devices\t_scanner.dm" #include "code\game\objects\items\devices\taperecorder.dm" @@ -1441,10 +1264,7 @@ #include "code\game\objects\items\devices\uplink.dm" #include "code\game\objects\items\devices\uplink_random_lists.dm" #include "code\game\objects\items\devices\whistle.dm" -<<<<<<< HEAD #include "code\game\objects\items\devices\communicator\cartridge.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\communicator\communicator.dm" #include "code\game\objects\items\devices\communicator\helper.dm" #include "code\game\objects\items\devices\communicator\integrated.dm" @@ -1456,22 +1276,15 @@ #include "code\game\objects\items\devices\radio\encryptionkey.dm" #include "code\game\objects\items\devices\radio\encryptionkey_vr.dm" #include "code\game\objects\items\devices\radio\headset.dm" -<<<<<<< HEAD #include "code\game\objects\items\devices\radio\headset_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\radio\headset_vr.dm" #include "code\game\objects\items\devices\radio\intercom.dm" #include "code\game\objects\items\devices\radio\jammer.dm" #include "code\game\objects\items\devices\radio\jammer_vr.dm" #include "code\game\objects\items\devices\radio\radio.dm" -<<<<<<< HEAD #include "code\game\objects\items\devices\radio\radio_ch.dm" #include "code\game\objects\items\devices\radio\radio_vr.dm" #include "code\game\objects\items\devices\radio\radio_yw.dm" -======= -#include "code\game\objects\items\devices\radio\radio_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\devices\radio\radiopack.dm" #include "code\game\objects\items\robot\robot_items.dm" #include "code\game\objects\items\robot\robot_parts.dm" @@ -1488,25 +1301,17 @@ #include "code\game\objects\items\stacks\telecrystal.dm" #include "code\game\objects\items\stacks\tickets.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm" -<<<<<<< HEAD #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles_yw.dm" #include "code\game\objects\items\stacks\tiles\tile_types.dm" #include "code\game\objects\items\stacks\tiles\tile_types_ch.dm" #include "code\game\objects\items\stacks\tiles\tile_types_yw.dm" -======= -#include "code\game\objects\items\stacks\tiles\tile_types.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\toys\balls_vr.dm" #include "code\game\objects\items\toys\godfigures.dm" #include "code\game\objects\items\toys\mech_toys.dm" #include "code\game\objects\items\toys\toys.dm" -<<<<<<< HEAD #include "code\game\objects\items\toys\toys_ch.dm" #include "code\game\objects\items\toys\toys_vr.dm" #include "code\game\objects\items\toys\toys_yw.dm" -======= -#include "code\game\objects\items\toys\toys_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\AI_modules_vr.dm" #include "code\game\objects\items\weapons\augment_items.dm" @@ -1527,21 +1332,14 @@ #include "code\game\objects\items\weapons\extinguisher.dm" #include "code\game\objects\items\weapons\flamethrower.dm" #include "code\game\objects\items\weapons\gift_wrappaper.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\gift_wrappaper_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\handcuffs.dm" #include "code\game\objects\items\weapons\handcuffs_vr.dm" #include "code\game\objects\items\weapons\improvised_components.dm" #include "code\game\objects\items\weapons\inducer_vr.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\lego.dm" #include "code\game\objects\items\weapons\manuals.dm" #include "code\game\objects\items\weapons\manuals_ch.dm" -======= -#include "code\game\objects\items\weapons\manuals.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\manuals_vr.dm" #include "code\game\objects\items\weapons\mop.dm" #include "code\game\objects\items\weapons\mop_deploy.dm" @@ -1561,10 +1359,7 @@ #include "code\game\objects\items\weapons\swords_axes_etc.dm" #include "code\game\objects\items\weapons\syndie.dm" #include "code\game\objects\items\weapons\tape.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\taskmanager_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\teleportation.dm" #include "code\game\objects\items\weapons\towels.dm" #include "code\game\objects\items\weapons\traps.dm" @@ -1572,7 +1367,6 @@ #include "code\game\objects\items\weapons\trays.dm" #include "code\game\objects\items\weapons\weaponry.dm" #include "code\game\objects\items\weapons\weldbackpack.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\weldbackpack_ch.dm" #include "code\game\objects\items\weapons\circuitboards\broken.dm" #include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" @@ -1582,13 +1376,6 @@ #include "code\game\objects\items\weapons\circuitboards\frame_ch.dm" #include "code\game\objects\items\weapons\circuitboards\mecha.dm" #include "code\game\objects\items\weapons\circuitboards\mecha_ch.dm" -======= -#include "code\game\objects\items\weapons\circuitboards\broken.dm" -#include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" -#include "code\game\objects\items\weapons\circuitboards\circuitboards_vr.dm" -#include "code\game\objects\items\weapons\circuitboards\frame.dm" -#include "code\game\objects\items\weapons\circuitboards\mecha.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\circuitboards\other.dm" #include "code\game\objects\items\weapons\circuitboards\computer\air_management.dm" #include "code\game\objects\items\weapons\circuitboards\computer\camera_monitor.dm" @@ -1618,10 +1405,7 @@ #include "code\game\objects\items\weapons\grenades\anti_photon_grenade.dm" #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" #include "code\game\objects\items\weapons\grenades\concussion.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\grenades\confetti_grenade_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\grenades\emgrenade.dm" #include "code\game\objects\items\weapons\grenades\explosive.dm" #include "code\game\objects\items\weapons\grenades\flashbang.dm" @@ -1629,27 +1413,18 @@ #include "code\game\objects\items\weapons\grenades\projectile.dm" #include "code\game\objects\items\weapons\grenades\smokebomb.dm" #include "code\game\objects\items\weapons\grenades\spawnergrenade.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\grenades\spawnergrenade_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\grenades\spawnergrenade_vr.dm" #include "code\game\objects\items\weapons\grenades\supermatter.dm" #include "code\game\objects\items\weapons\id cards\cards.dm" #include "code\game\objects\items\weapons\id cards\cards_vr.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\id cards\CH_ids.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\id cards\id_stacks.dm" #include "code\game\objects\items\weapons\id cards\id_stacks_vr.dm" #include "code\game\objects\items\weapons\id cards\station_ids.dm" #include "code\game\objects\items\weapons\id cards\station_ids_vr.dm" #include "code\game\objects\items\weapons\id cards\syndicate_ids.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\id cards\YW_ids.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\implants\implant.dm" #include "code\game\objects\items\weapons\implants\implant_vr.dm" #include "code\game\objects\items\weapons\implants\implantaugment.dm" @@ -1663,10 +1438,7 @@ #include "code\game\objects\items\weapons\implants\implantfreedom.dm" #include "code\game\objects\items\weapons\implants\implantlanguage.dm" #include "code\game\objects\items\weapons\implants\implantpad.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\implants\implantreagent_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\implants\implantreagent_vr.dm" #include "code\game\objects\items\weapons\implants\implantrestrainingbolt.dm" #include "code\game\objects\items\weapons\implants\implantuplink.dm" @@ -1682,19 +1454,13 @@ #include "code\game\objects\items\weapons\material\material_armor.dm" #include "code\game\objects\items\weapons\material\material_weapons.dm" #include "code\game\objects\items\weapons\material\misc.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\material\misc_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\material\shards.dm" #include "code\game\objects\items\weapons\material\shards_vr.dm" #include "code\game\objects\items\weapons\material\swords.dm" #include "code\game\objects\items\weapons\material\thrown.dm" #include "code\game\objects\items\weapons\material\twohanded.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\material\twohanded_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\material\twohanded_vr.dm" #include "code\game\objects\items\weapons\material\whetstone.dm" #include "code\game\objects\items\weapons\melee\deflect.dm" @@ -1710,19 +1476,13 @@ #include "code\game\objects\items\weapons\storage\belt_vr.dm" #include "code\game\objects\items\weapons\storage\bible.dm" #include "code\game\objects\items\weapons\storage\boxes.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\storage\boxes_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\storage\boxes_vr.dm" #include "code\game\objects\items\weapons\storage\briefcase.dm" #include "code\game\objects\items\weapons\storage\egg_vr.dm" #include "code\game\objects\items\weapons\storage\fancy.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\storage\fancy_ch.dm" #include "code\game\objects\items\weapons\storage\fancy_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\items\weapons\storage\firstaid.dm" #include "code\game\objects\items\weapons\storage\firstaid_vr.dm" #include "code\game\objects\items\weapons\storage\internal.dm" @@ -1749,18 +1509,12 @@ #include "code\game\objects\items\weapons\tools\weldingtool.dm" #include "code\game\objects\items\weapons\tools\wirecutters.dm" #include "code\game\objects\items\weapons\tools\wrench.dm" -<<<<<<< HEAD #include "code\game\objects\items\weapons\tools\zspicytools_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\random\_random.dm" #include "code\game\objects\random\guns_and_ammo.dm" #include "code\game\objects\random\maintenance.dm" #include "code\game\objects\random\mapping.dm" -<<<<<<< HEAD #include "code\game\objects\random\mapping_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\random\mapping_vr.dm" #include "code\game\objects\random\mechs.dm" #include "code\game\objects\random\misc.dm" @@ -1775,10 +1529,7 @@ #include "code\game\objects\structures\bedsheet_bin.dm" #include "code\game\objects\structures\bedsheet_bin_vr.dm" #include "code\game\objects\structures\bonfire.dm" -<<<<<<< HEAD #include "code\game\objects\structures\boxing_rope_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\catwalk.dm" #include "code\game\objects\structures\cliff.dm" #include "code\game\objects\structures\coathanger.dm" @@ -1807,10 +1558,7 @@ #include "code\game\objects\structures\ledges.dm" #include "code\game\objects\structures\lightpost.dm" #include "code\game\objects\structures\loot_piles.dm" -<<<<<<< HEAD #include "code\game\objects\structures\loot_piles_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\low_wall.dm" #include "code\game\objects\structures\map_blocker_vr.dm" #include "code\game\objects\structures\medical_stand_vr.dm" @@ -1818,15 +1566,10 @@ #include "code\game\objects\structures\mop_bucket.dm" #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\morgue_vr.dm" -<<<<<<< HEAD #include "code\game\objects\structures\new_signs.dm" #include "code\game\objects\structures\plasticflaps.dm" #include "code\game\objects\structures\railing.dm" #include "code\game\objects\structures\reflectors_ch.dm" -======= -#include "code\game\objects\structures\plasticflaps.dm" -#include "code\game\objects\structures\railing.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\safe.dm" #include "code\game\objects\structures\salvageable.dm" #include "code\game\objects\structures\signs.dm" @@ -1839,10 +1582,7 @@ #include "code\game\objects\structures\target_stake.dm" #include "code\game\objects\structures\transit_tubes.dm" #include "code\game\objects\structures\trash_pile_vr.dm" -<<<<<<< HEAD #include "code\game\objects\structures\trash_pile_vr_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\under_wardrobe.dm" #include "code\game\objects\structures\watercloset.dm" #include "code\game\objects\structures\watercloset_vr.dm" @@ -1856,18 +1596,12 @@ #include "code\game\objects\structures\crates_lockers\__closets.dm" #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions.dm" #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_vr.dm" -<<<<<<< HEAD #include "code\game\objects\structures\crates_lockers\_closets_appearance_definitions_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\crates_lockers\crates.dm" #include "code\game\objects\structures\crates_lockers\crates_vr.dm" #include "code\game\objects\structures\crates_lockers\largecrate.dm" #include "code\game\objects\structures\crates_lockers\largecrate_vr.dm" -<<<<<<< HEAD #include "code\game\objects\structures\crates_lockers\largecrate_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\crates_lockers\vehiclecage.dm" #include "code\game\objects\structures\crates_lockers\closets\coffin.dm" #include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm" @@ -1882,10 +1616,7 @@ #include "code\game\objects\structures\crates_lockers\closets\syndicate.dm" #include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\utility_closets_vr.dm" -<<<<<<< HEAD #include "code\game\objects\structures\crates_lockers\closets\utility_closets_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\crates_lockers\closets\walllocker.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe_vr.dm" @@ -1935,30 +1666,21 @@ #include "code\game\objects\structures\stool_bed_chair_nest\alien_nests.dm" #include "code\game\objects\structures\stool_bed_chair_nest\bed.dm" #include "code\game\objects\structures\stool_bed_chair_nest\chairs.dm" -<<<<<<< HEAD #include "code\game\objects\structures\stool_bed_chair_nest\chairs_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\objects\structures\stool_bed_chair_nest\chairs_vr.dm" #include "code\game\objects\structures\stool_bed_chair_nest\stools.dm" #include "code\game\objects\structures\stool_bed_chair_nest\stools_vr.dm" #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair.dm" #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair_item.dm" #include "code\game\turfs\simulated.dm" -<<<<<<< HEAD #include "code\game\turfs\simulated_ch.dm" #include "code\game\turfs\simulated_vr.dm" #include "code\game\turfs\turf.dm" #include "code\game\turfs\turf_ch.dm" -======= -#include "code\game\turfs\simulated_vr.dm" -#include "code\game\turfs\turf.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\turf_changing.dm" #include "code\game\turfs\turf_flick_animations.dm" #include "code\game\turfs\unsimulated.dm" #include "code\game\turfs\weird_turfs_vr.dm" -<<<<<<< HEAD #include "code\game\turfs\flooring\floor_yw.dm" #include "code\game\turfs\flooring\flooring.dm" #include "code\game\turfs\flooring\flooring_ch.dm" @@ -1966,11 +1688,6 @@ #include "code\game\turfs\flooring\flooring_decals_ch.dm" #include "code\game\turfs\flooring\flooring_decals_vr.dm" #include "code\game\turfs\flooring\flooring_decals_yw.dm" -======= -#include "code\game\turfs\flooring\flooring.dm" -#include "code\game\turfs\flooring\flooring_decals.dm" -#include "code\game\turfs\flooring\flooring_decals_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\flooring\flooring_premade.dm" #include "code\game\turfs\flooring\flooring_vr.dm" #include "code\game\turfs\flooring\shuttle_vr.dm" @@ -1995,10 +1712,7 @@ #include "code\game\turfs\simulated\walls.dm" #include "code\game\turfs\simulated\water.dm" #include "code\game\turfs\simulated\water_vr.dm" -<<<<<<< HEAD #include "code\game\turfs\simulated\water_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\simulated\dungeon\floor.dm" #include "code\game\turfs\simulated\dungeon\wall.dm" #include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm" @@ -2019,11 +1733,7 @@ #include "code\game\turfs\unsimulated\beach_vr.dm" #include "code\game\turfs\unsimulated\floor.dm" #include "code\game\turfs\unsimulated\planetary.dm" -<<<<<<< HEAD #include "code\game\turfs\unsimulated\planetary_yw.dm" -======= -#include "code\game\turfs\unsimulated\planetary_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\game\turfs\unsimulated\shuttle.dm" #include "code\game\turfs\unsimulated\sky_vr.dm" #include "code\game\turfs\unsimulated\walls.dm" @@ -2094,10 +1804,7 @@ #include "code\modules\admin\secrets\random_events\gravity.dm" #include "code\modules\admin\secrets\random_events\trigger_cordical_borer_infestation.dm" #include "code\modules\admin\secrets\random_events\trigger_xenomorph_infestation.dm" -<<<<<<< HEAD #include "code\modules\admin\verbs\admin_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\admin\verbs\adminhelp.dm" #include "code\modules\admin\verbs\adminhelp_vr.dm" #include "code\modules\admin\verbs\adminjump.dm" @@ -2111,15 +1818,9 @@ #include "code\modules\admin\verbs\check_customitem_activity.dm" #include "code\modules\admin\verbs\cinematic.dm" #include "code\modules\admin\verbs\custom_event.dm" -<<<<<<< HEAD #include "code\modules\admin\verbs\deadsay.dm" #include "code\modules\admin\verbs\debug.dm" #include "code\modules\admin\verbs\debug_ch.dm" -======= -#include "code\modules\admin\verbs\dbcon_fix.dm" -#include "code\modules\admin\verbs\deadsay.dm" -#include "code\modules\admin\verbs\debug.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\admin\verbs\debug_vr.dm" #include "code\modules\admin\verbs\diagnostics.dm" #include "code\modules\admin\verbs\dice.dm" @@ -2169,13 +1870,9 @@ #include "code\modules\ai\ai_holder_targeting_vr.dm" #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" -<<<<<<< HEAD #include "code\modules\ai\say_list_ch.dm" #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_ch.dm" -======= -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" #include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" @@ -2246,7 +1943,6 @@ #include "code\modules\blob2\overmind\types\shifting_fragments.dm" #include "code\modules\blob2\overmind\types\synchronous_mesh.dm" #include "code\modules\blob2\overmind\types\volatile_alluvium.dm" -<<<<<<< HEAD #include "code\modules\busy_space_yw\air_traffic.dm" #include "code\modules\busy_space_yw\loremaster.dm" #include "code\modules\busy_space_yw\organizations.dm" @@ -2254,21 +1950,6 @@ #include "code\modules\catalogue\catalogue_data.dm" #include "code\modules\catalogue\catalogue_data_vr.dm" #include "code\modules\catalogue\catalogue_data_yw.dm" -======= -#include "code\modules\busy_space_vr\air_traffic.dm" -#include "code\modules\busy_space_vr\loremaster.dm" -#include "code\modules\busy_space_vr\organizations.dm" -#include "code\modules\casino\casino.dm" -#include "code\modules\casino\casino_book.dm" -#include "code\modules\casino\casino_cards.dm" -#include "code\modules\casino\casino_prize_vendor.dm" -#include "code\modules\casino\premium_dispenser.dm" -#include "code\modules\casino\premium_vendors.dm" -#include "code\modules\casino\slots.dm" -#include "code\modules\catalogue\atoms.dm" -#include "code\modules\catalogue\catalogue_data.dm" -#include "code\modules\catalogue\catalogue_data_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\catalogue\cataloguer.dm" #include "code\modules\catalogue\cataloguer_visuals.dm" #include "code\modules\catalogue\cataloguer_vr.dm" @@ -2277,7 +1958,6 @@ #include "code\modules\client\client procs_vr.dm" #include "code\modules\client\movement.dm" #include "code\modules\client\preferences.dm" -<<<<<<< HEAD #include "code\modules\client\preferences_ch.dm" #include "code\modules\client\preferences_factions.dm" #include "code\modules\client\preferences_savefile.dm" @@ -2286,13 +1966,6 @@ #include "code\modules\client\preferences_toggle_procs.dm" #include "code\modules\client\preferences_vr.dm" #include "code\modules\client\preferences_yw.dm" -======= -#include "code\modules\client\preferences_factions.dm" -#include "code\modules\client\preferences_savefile.dm" -#include "code\modules\client\preferences_spawnpoints.dm" -#include "code\modules\client\preferences_toggle_procs.dm" -#include "code\modules\client\preferences_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\spam_prevention.dm" #include "code\modules\client\stored_item.dm" #include "code\modules\client\ui_style.dm" @@ -2304,10 +1977,7 @@ #include "code\modules\client\preference_setup\general\01_basic.dm" #include "code\modules\client\preference_setup\general\02_language.dm" #include "code\modules\client\preference_setup\general\03_body.dm" -<<<<<<< HEAD #include "code\modules\client\preference_setup\general\03_body_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\general\04_equipment.dm" #include "code\modules\client\preference_setup\general\05_background.dm" #include "code\modules\client\preference_setup\general\06_flavor.dm" @@ -2321,40 +1991,28 @@ #include "code\modules\client\preference_setup\loadout\loadout.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories_vr.dm" -<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_accessories_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm" #include "code\modules\client\preference_setup\loadout\loadout_cosmetics_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_cyberware.dm" #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes_vr.dm" -<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_eyes_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems_ch.dm" -======= -#include "code\modules\client\preference_setup\loadout\loadout_fluffitems_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_general.dm" #include "code\modules\client\preference_setup\loadout\loadout_general_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" -<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_head_ch.dm" #include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head_yw.dm" -======= -#include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" -<<<<<<< HEAD #include "code\modules\client\preference_setup\loadout\loadout_smoking_ch.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" @@ -2369,16 +2027,6 @@ #include "code\modules\client\preference_setup\loadout\loadout_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno_ch.dm" -======= -#include "code\modules\client\preference_setup\loadout\loadout_suit.dm" -#include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" -#include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" -#include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" -#include "code\modules\client\preference_setup\loadout\loadout_utility.dm" -#include "code\modules\client\preference_setup\loadout\loadout_utility_vr.dm" -#include "code\modules\client\preference_setup\loadout\loadout_vr.dm" -#include "code\modules\client\preference_setup\loadout\loadout_xeno.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\preference_setup\loadout\loadout_xeno_vr.dm" #include "code\modules\client\preference_setup\occupation\occupation.dm" #include "code\modules\client\preference_setup\skills\skills.dm" @@ -2397,19 +2045,12 @@ #include "code\modules\client\verbs\character_directory.dm" #include "code\modules\client\verbs\ignore.dm" #include "code\modules\client\verbs\ooc.dm" -<<<<<<< HEAD -======= -#include "code\modules\client\verbs\ping.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\client\verbs\suicide.dm" #include "code\modules\client\verbs\who.dm" #include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\clothing_accessories.dm" -<<<<<<< HEAD #include "code\modules\clothing\clothing_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\clothing_icons.dm" #include "code\modules\clothing\clothing_vr.dm" #include "code\modules\clothing\ears\earrings.dm" @@ -2430,7 +2071,6 @@ #include "code\modules\clothing\head\flowercrowns.dm" #include "code\modules\clothing\head\hardhat.dm" #include "code\modules\clothing\head\helmet.dm" -<<<<<<< HEAD #include "code\modules\clothing\head\helmet_ch.dm" #include "code\modules\clothing\head\helmet_vr.dm" #include "code\modules\clothing\head\hood.dm" @@ -2441,14 +2081,6 @@ #include "code\modules\clothing\head\jobs_yw.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_ch.dm" -======= -#include "code\modules\clothing\head\helmet_vr.dm" -#include "code\modules\clothing\head\hood.dm" -#include "code\modules\clothing\head\hood_vr.dm" -#include "code\modules\clothing\head\jobs.dm" -#include "code\modules\clothing\head\jobs_vr.dm" -#include "code\modules\clothing\head\misc.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\misc_vr.dm" #include "code\modules\clothing\head\pilot_helmet.dm" @@ -2464,10 +2096,7 @@ #include "code\modules\clothing\masks\hailer.dm" #include "code\modules\clothing\masks\miscellaneous.dm" #include "code\modules\clothing\masks\shiny_vr.dm" -<<<<<<< HEAD #include "code\modules\clothing\masks\tesh_synth_facemask.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\masks\voice.dm" #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" @@ -2493,13 +2122,9 @@ #include "code\modules\clothing\spacesuits\rig\rig_tgui.dm" #include "code\modules\clothing\spacesuits\rig\rig_verbs.dm" #include "code\modules\clothing\spacesuits\rig\rig_wiring.dm" -<<<<<<< HEAD #include "code\modules\clothing\spacesuits\rig\modules\combat_ch.dm" #include "code\modules\clothing\spacesuits\rig\modules\modules.dm" #include "code\modules\clothing\spacesuits\rig\modules\utility_ch.dm" -======= -#include "code\modules\clothing\spacesuits\rig\modules\modules.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\spacesuits\rig\modules\specific\ai_container.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\chem_dispenser.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\cleaner_launcher.dm" @@ -2524,10 +2149,7 @@ #include "code\modules\clothing\spacesuits\rig\modules\specific\vision.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\voice.dm" #include "code\modules\clothing\spacesuits\rig\suits\alien.dm" -<<<<<<< HEAD #include "code\modules\clothing\spacesuits\rig\suits\alien_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\spacesuits\rig\suits\combat.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert_vr.dm" @@ -2536,10 +2158,7 @@ #include "code\modules\clothing\spacesuits\rig\suits\pmc.dm" #include "code\modules\clothing\spacesuits\rig\suits\robotics.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" -<<<<<<< HEAD #include "code\modules\clothing\spacesuits\rig\suits\station_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" #include "code\modules\clothing\spacesuits\void\ert_vr.dm" #include "code\modules\clothing\spacesuits\void\event.dm" @@ -2552,7 +2171,6 @@ #include "code\modules\clothing\spacesuits\void\void_vr.dm" #include "code\modules\clothing\spacesuits\void\wizard.dm" #include "code\modules\clothing\spacesuits\void\zaddat.dm" -<<<<<<< HEAD #include "code\modules\clothing\spacesuits\void\zaddat_yw.dm" #include "code\modules\clothing\suits\armor.dm" #include "code\modules\clothing\suits\armor_vr.dm" @@ -2563,14 +2181,6 @@ #include "code\modules\clothing\suits\hooded_ch.dm" #include "code\modules\clothing\suits\hooded_vr.dm" #include "code\modules\clothing\suits\hooded_yw.dm" -======= -#include "code\modules\clothing\suits\armor.dm" -#include "code\modules\clothing\suits\armor_vr.dm" -#include "code\modules\clothing\suits\bio.dm" -#include "code\modules\clothing\suits\bio_vr.dm" -#include "code\modules\clothing\suits\hooded.dm" -#include "code\modules\clothing\suits\hooded_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\jobs_vr.dm" #include "code\modules\clothing\suits\labcoat.dm" @@ -2580,51 +2190,33 @@ #include "code\modules\clothing\suits\solgov.dm" #include "code\modules\clothing\suits\solgov_vr.dm" #include "code\modules\clothing\suits\storage.dm" -<<<<<<< HEAD #include "code\modules\clothing\suits\storage_yw.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\utility_vr.dm" #include "code\modules\clothing\suits\wiz_robe.dm" #include "code\modules\clothing\suits\wolfbrigade.dm" -======= -#include "code\modules\clothing\suits\utility.dm" -#include "code\modules\clothing\suits\utility_vr.dm" -#include "code\modules\clothing\suits\wiz_robe.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\suits\aliens\tajara.dm" #include "code\modules\clothing\suits\aliens\teshari.dm" #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" #include "code\modules\clothing\under\color.dm" -<<<<<<< HEAD #include "code\modules\clothing\under\extrauniforms_yw.dm" #include "code\modules\clothing\under\imperial_vr.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\miscellaneous_ch.dm" -======= -#include "code\modules\clothing\under\imperial_vr.dm" -#include "code\modules\clothing\under\miscellaneous.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\under\miscellaneous_vr.dm" #include "code\modules\clothing\under\nanotrasen_vr.dm" #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shiny_vr.dm" #include "code\modules\clothing\under\shorts.dm" -<<<<<<< HEAD #include "code\modules\clothing\under\shorts_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\under\solgov.dm" #include "code\modules\clothing\under\solgov_vr.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" -<<<<<<< HEAD #include "code\modules\clothing\under\accessories\accessory_ch.dm" #include "code\modules\clothing\under\accessories\accessory_vr.dm" #include "code\modules\clothing\under\accessories\accessory_yw.dm" -======= -#include "code\modules\clothing\under\accessories\accessory_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\clothing\under\accessories\armband.dm" #include "code\modules\clothing\under\accessories\armor.dm" #include "code\modules\clothing\under\accessories\badges.dm" @@ -2669,11 +2261,7 @@ #include "code\modules\economy\ATM.dm" #include "code\modules\economy\cash.dm" #include "code\modules\economy\cash_register.dm" -<<<<<<< HEAD #include "code\modules\economy\casinocash_ch.dm" -======= -#include "code\modules\economy\casinocash.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\economy\coins.dm" #include "code\modules\economy\coins_vr.dm" #include "code\modules\economy\economy_misc.dm" @@ -2684,11 +2272,8 @@ #include "code\modules\economy\mint.dm" #include "code\modules\economy\money_bag.dm" #include "code\modules\economy\price_list.dm" -<<<<<<< HEAD #include "code\modules\economy\price_list_ch.dm" #include "code\modules\economy\price_list_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\economy\retail_scanner.dm" #include "code\modules\economy\TradeDestinations.dm" #include "code\modules\economy\vending.dm" @@ -2704,10 +2289,7 @@ #include "code\modules\emotes\definitions\audible_cough.dm" #include "code\modules\emotes\definitions\audible_furry_vr.dm" #include "code\modules\emotes\definitions\audible_scream.dm" -<<<<<<< HEAD #include "code\modules\emotes\definitions\audible_scream_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\emotes\definitions\audible_scream_vr.dm" #include "code\modules\emotes\definitions\audible_slap.dm" #include "code\modules\emotes\definitions\audible_snap.dm" @@ -2741,10 +2323,7 @@ #include "code\modules\events\drone_pod_vr.dm" #include "code\modules\events\dust.dm" #include "code\modules\events\electrical_storm.dm" -<<<<<<< HEAD #include "code\modules\events\electrified_door.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\event.dm" #include "code\modules\events\event_container.dm" #include "code\modules\events\event_container_vr.dm" @@ -2760,18 +2339,12 @@ #include "code\modules\events\maintenance_predator_vr.dm" #include "code\modules\events\meteor_strike_vr.dm" #include "code\modules\events\meteors.dm" -<<<<<<< HEAD #include "code\modules\events\metroid_infestation.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\money_hacker.dm" #include "code\modules\events\money_lotto.dm" #include "code\modules\events\money_spam.dm" #include "code\modules\events\morph_spawn_vr.dm" -<<<<<<< HEAD #include "code\modules\events\mutants.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\prison_break.dm" #include "code\modules\events\radiation_storm.dm" #include "code\modules\events\random_antagonist.dm" @@ -2781,27 +2354,18 @@ #include "code\modules\events\space_ninja.dm" #include "code\modules\events\spacevine.dm" #include "code\modules\events\spider_infestation.dm" -<<<<<<< HEAD #include "code\modules\events\spider_migration_yw.dm" #include "code\modules\events\spontaneous_appendicitis.dm" #include "code\modules\events\spontaneous_appendicitis_vr.dm" #include "code\modules\events\supply_demand_vr.dm" #include "code\modules\events\viral_infection.dm" -======= -#include "code\modules\events\spontaneous_appendicitis.dm" -#include "code\modules\events\spontaneous_appendicitis_vr.dm" -#include "code\modules\events\supply_demand_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\events\wallrot.dm" #include "code\modules\examine\examine.dm" #include "code\modules\examine\stat_icons.dm" #include "code\modules\examine\descriptions\armor.dm" #include "code\modules\examine\descriptions\atmospherics.dm" #include "code\modules\examine\descriptions\containers.dm" -<<<<<<< HEAD #include "code\modules\examine\descriptions\containers_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\examine\descriptions\devices.dm" #include "code\modules\examine\descriptions\engineering.dm" #include "code\modules\examine\descriptions\machines.dm" @@ -2831,53 +2395,35 @@ #include "code\modules\food\recipes_fryer_vr.dm" #include "code\modules\food\recipes_grill.dm" #include "code\modules\food\recipes_microwave.dm" -<<<<<<< HEAD #include "code\modules\food\recipes_microwave_ch.dm" #include "code\modules\food\recipes_microwave_vr.dm" #include "code\modules\food\recipes_oven.dm" #include "code\modules\food\recipes_oven_ch.dm" -======= -#include "code\modules\food\recipes_microwave_vr.dm" -#include "code\modules\food\recipes_oven.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\recipes_oven_vr.dm" #include "code\modules\food\drinkingglass\drinkingglass.dm" #include "code\modules\food\drinkingglass\extras.dm" #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" -<<<<<<< HEAD #include "code\modules\food\drinkingglass\metaglass_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\drinkingglass\metaglass_vr.dm" #include "code\modules\food\drinkingglass\serving_glasses.dm" #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\drinkingglass\shaker_vr.dm" #include "code\modules\food\food\cans.dm" -<<<<<<< HEAD #include "code\modules\food\food\cans_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" #include "code\modules\food\food\drinks_vr.dm" #include "code\modules\food\food\lunch.dm" #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" -<<<<<<< HEAD #include "code\modules\food\food\snacks_ch.dm" #include "code\modules\food\food\snacks_vr.dm" #include "code\modules\food\food\thecake_ch.dm" #include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" #include "code\modules\food\food\drinks\bottle_ch.dm" -======= -#include "code\modules\food\food\snacks_vr.dm" -#include "code\modules\food\food\thecake.dm" -#include "code\modules\food\food\z_custom_food_vr.dm" -#include "code\modules\food\food\drinks\bottle.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\food\drinks\cup.dm" #include "code\modules\food\food\drinks\drinkingglass.dm" #include "code\modules\food\food\drinks\jar.dm" @@ -2889,10 +2435,7 @@ #include "code\modules\food\kitchen\gibber.dm" #include "code\modules\food\kitchen\icecream.dm" #include "code\modules\food\kitchen\microwave.dm" -<<<<<<< HEAD #include "code\modules\food\kitchen\microwave_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\food\kitchen\cooking_machines\_appliance.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" @@ -2957,10 +2500,7 @@ #include "code\modules\games\cah_white_cards.dm" #include "code\modules\games\cardemon.dm" #include "code\modules\games\cards.dm" -<<<<<<< HEAD #include "code\modules\games\cards_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\games\dice.dm" #include "code\modules\games\spaceball_cards.dm" #include "code\modules\games\tarot.dm" @@ -2977,27 +2517,18 @@ #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\grown_inedible.dm" #include "code\modules\hydroponics\grown_predefined.dm" -<<<<<<< HEAD +#include "code\modules\hydroponics\grown_sif.dm" #include "code\modules\hydroponics\seed.dm" #include "code\modules\hydroponics\seed_datums_ch.dm" #include "code\modules\hydroponics\seed_datums_vr.dm" #include "code\modules\hydroponics\seed_datums_yw.dm" -======= -#include "code\modules\hydroponics\grown_sif.dm" -#include "code\modules\hydroponics\seed.dm" -#include "code\modules\hydroponics\seed_datums_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\hydroponics\seed_gene_mut.dm" #include "code\modules\hydroponics\seed_machines.dm" #include "code\modules\hydroponics\seed_mobs.dm" #include "code\modules\hydroponics\seed_packets.dm" -<<<<<<< HEAD #include "code\modules\hydroponics\seed_packets_ch.dm" #include "code\modules\hydroponics\seed_packets_vr.dm" #include "code\modules\hydroponics\seed_packets_yw.dm" -======= -#include "code\modules\hydroponics\seed_packets_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\hydroponics\seed_storage.dm" #include "code\modules\hydroponics\seed_storage_vr.dm" #include "code\modules\hydroponics\beekeeping\beehive.dm" @@ -3064,10 +2595,7 @@ #include "code\modules\identification\identification.dm" #include "code\modules\identification\item_procs.dm" #include "code\modules\instruments\items.dm" -<<<<<<< HEAD #include "code\modules\instruments\items_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\instruments\stationary.dm" #include "code\modules\instruments\instrument_data\_instrument_data.dm" #include "code\modules\instruments\instrument_data\_instrument_key.dm" @@ -3120,10 +2648,7 @@ #include "code\modules\integrated_electronics\subtypes\smart.dm" #include "code\modules\integrated_electronics\subtypes\time.dm" #include "code\modules\integrated_electronics\subtypes\trig.dm" -<<<<<<< HEAD #include "code\modules\integrated_electronics\subtypes\z_mixed_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\integrated_electronics\~defines\~defines.dm" #include "code\modules\keybindings\bindings_atom.dm" #include "code\modules\keybindings\bindings_movekeys.dm" @@ -3156,19 +2681,11 @@ #include "code\modules\lore_codex\codex.dm" #include "code\modules\lore_codex\codex_tree.dm" #include "code\modules\lore_codex\pages.dm" -<<<<<<< HEAD #include "code\modules\lore_codex\lore_data_yw\important_locations.dm" #include "code\modules\lore_codex\lore_data_yw\main.dm" #include "code\modules\lore_codex\lore_data_yw\orgs.dm" #include "code\modules\lore_codex\lore_data_yw\political_parties.dm" #include "code\modules\lore_codex\lore_data_yw\species.dm" -======= -#include "code\modules\lore_codex\lore_data_vr\important_locations.dm" -#include "code\modules\lore_codex\lore_data_vr\main.dm" -#include "code\modules\lore_codex\lore_data_vr\orgs.dm" -#include "code\modules\lore_codex\lore_data_vr\political_parties.dm" -#include "code\modules\lore_codex\lore_data_vr\species.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\lore_codex\news_data\main.dm" #include "code\modules\lore_codex\robutt_data\bybrand.dm" #include "code\modules\lore_codex\robutt_data\main_robutts.dm" @@ -3192,10 +2709,7 @@ #include "code\modules\materials\materials\holographic.dm" #include "code\modules\materials\materials\other_vr.dm" #include "code\modules\materials\materials\plastic.dm" -<<<<<<< HEAD #include "code\modules\materials\materials\plastic_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\materials\materials\snow.dm" #include "code\modules\materials\materials\stone.dm" #include "code\modules\materials\materials\supermatter.dm" @@ -3204,26 +2718,17 @@ #include "code\modules\materials\materials\metals\metals.dm" #include "code\modules\materials\materials\metals\metals_vr.dm" #include "code\modules\materials\materials\metals\plasteel.dm" -<<<<<<< HEAD #include "code\modules\materials\materials\metals\plasteel_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\materials\materials\metals\plasteel_vr.dm" #include "code\modules\materials\materials\metals\steel.dm" #include "code\modules\materials\materials\metals\steel_vr.dm" #include "code\modules\materials\materials\organic\animal_products.dm" #include "code\modules\materials\materials\organic\cloth.dm" -<<<<<<< HEAD #include "code\modules\materials\materials\organic\cloth_ch.dm" #include "code\modules\materials\materials\organic\leather.dm" #include "code\modules\materials\materials\organic\resin.dm" #include "code\modules\materials\materials\organic\wood.dm" #include "code\modules\materials\materials\organic\wood_ch.dm" -======= -#include "code\modules\materials\materials\organic\leather.dm" -#include "code\modules\materials\materials\organic\resin.dm" -#include "code\modules\materials\materials\organic\wood.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\materials\sheets\_sheets.dm" #include "code\modules\materials\sheets\gems.dm" #include "code\modules\materials\sheets\glass.dm" @@ -3326,10 +2831,7 @@ #include "code\modules\mob\_modifiers\traits_phobias.dm" #include "code\modules\mob\_modifiers\unholy.dm" #include "code\modules\mob\dead\corpse.dm" -<<<<<<< HEAD #include "code\modules\mob\dead\corpse_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\dead\corpse_vr.dm" #include "code\modules\mob\dead\death.dm" #include "code\modules\mob\dead\observer\free_vr.dm" @@ -3357,10 +2859,7 @@ #include "code\modules\mob\language\outsider.dm" #include "code\modules\mob\language\station.dm" #include "code\modules\mob\language\station_vr.dm" -<<<<<<< HEAD #include "code\modules\mob\language\station_YW.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\language\synthetic.dm" #include "code\modules\mob\living\autohiss.dm" #include "code\modules\mob\living\butchering.dm" @@ -3370,10 +2869,7 @@ #include "code\modules\mob\living\inventory.dm" #include "code\modules\mob\living\life.dm" #include "code\modules\mob\living\living.dm" -<<<<<<< HEAD #include "code\modules\mob\living\living_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\living_defense.dm" #include "code\modules\mob\living\living_defines.dm" #include "code\modules\mob\living\living_defines_vr.dm" @@ -3448,36 +2944,24 @@ #include "code\modules\mob\living\carbon\human\human_damage.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\human_defines_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\human_defines_vr.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_helpers_vr.dm" #include "code\modules\mob\living\carbon\human\human_modular_limbs.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\human_movement_ch.dm" #include "code\modules\mob\living\carbon\human\human_organs.dm" #include "code\modules\mob\living\carbon\human\human_powers.dm" #include "code\modules\mob\living\carbon\human\human_powers_vr.dm" #include "code\modules\mob\living\carbon\human\human_powers_YW.dm" -======= -#include "code\modules\mob\living\carbon\human\human_organs.dm" -#include "code\modules\mob\living\carbon\human\human_powers.dm" -#include "code\modules\mob\living\carbon\human\human_powers_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\human_resist.dm" #include "code\modules\mob\living\carbon\human\human_species.dm" #include "code\modules\mob\living\carbon\human\human_species_vr.dm" #include "code\modules\mob\living\carbon\human\human_vr.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\life_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\life_vr.dm" #include "code\modules\mob\living\carbon\human\login.dm" #include "code\modules\mob\living\carbon\human\logout.dm" @@ -3487,10 +2971,7 @@ #include "code\modules\mob\living\carbon\human\stripping.dm" #include "code\modules\mob\living\carbon\human\unarmed_attack.dm" #include "code\modules\mob\living\carbon\human\update_icons.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\update_icons_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\ai_controlled\ai_controlled.dm" #include "code\modules\mob\living\carbon\human\descriptors\_descriptors.dm" #include "code\modules\mob\living\carbon\human\descriptors\descriptors_generic.dm" @@ -3499,10 +2980,7 @@ #include "code\modules\mob\living\carbon\human\species\species.dm" #include "code\modules\mob\living\carbon\human\species\species_attack.dm" #include "code\modules\mob\living\carbon\human\species\species_attack_vr.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\species_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\species_getters.dm" #include "code\modules\mob\living\carbon\human\species\species_getters_vr.dm" #include "code\modules\mob\living\carbon\human\species\species_helpers.dm" @@ -3515,10 +2993,6 @@ #include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm" #include "code\modules\mob\living\carbon\human\species\outsider\skeleton.dm" #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm" -<<<<<<< HEAD -======= -#include "code\modules\mob\living\carbon\human\species\outsider\vox_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\shadekin\_defines.dm" #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin.dm" #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin_abilities.dm" @@ -3526,21 +3000,15 @@ #include "code\modules\mob\living\carbon\human\species\station\alraune.dm" #include "code\modules\mob\living\carbon\human\species\station\blank_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\golem.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\station\greyYW.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\station\human_subspecies.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey.dm" #include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\station\station_ch.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_vr.dm" @@ -3553,7 +3021,6 @@ #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_powers.dm" #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_species.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\negative.dm" -<<<<<<< HEAD #include "code\modules\mob\living\carbon\human\species\station\traits_vr\negative_ch.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral_ch.dm" @@ -3561,11 +3028,6 @@ #include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive_ch.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait_ch.dm" -======= -#include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm" -#include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive.dm" -#include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm" @@ -3625,19 +3087,13 @@ #include "code\modules\mob\living\silicon\robot\robot_animation_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_damage.dm" #include "code\modules\mob\living\silicon\robot\robot_items.dm" -<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\robot_modules_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\robot_movement.dm" #include "code\modules\mob\living\silicon\robot\robot_remote_control.dm" #include "code\modules\mob\living\silicon\robot\robot_vr.dm" #include "code\modules\mob\living\silicon\robot\syndicate.dm" #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm" -<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\drone.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm" @@ -3645,26 +3101,17 @@ #include "code\modules\mob\living\silicon\robot\drone\drone_damage.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm" -<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer_unify.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\swarm.dm" #include "code\modules\mob\living\silicon\robot\drone\swarm_abilities.dm" #include "code\modules\mob\living\silicon\robot\drone\swarm_items.dm" -<<<<<<< HEAD #include "code\modules\mob\living\silicon\robot\drone\zzz_unify_drone.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station_ch.dm" -======= -#include "code\modules\mob\living\silicon\robot\robot_modules\event.dm" -#include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm" -#include "code\modules\mob\living\silicon\robot\robot_modules\station.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\swarm.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\syndicate.dm" @@ -3678,18 +3125,11 @@ #include "code\modules\mob\living\silicon\robot\subtypes\thinktank\thinktank_module.dm" #include "code\modules\mob\living\silicon\robot\subtypes\thinktank\thinktank_storage.dm" #include "code\modules\mob\living\silicon\robot\subtypes\thinktank\thinktank_subtypes.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_animal\aliens\synx.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\appearance.dm" #include "code\modules\mob\living\simple_mob\butchering.dm" #include "code\modules\mob\living\simple_mob\combat.dm" #include "code\modules\mob\living\simple_mob\defense.dm" -<<<<<<< HEAD -======= -#include "code\modules\mob\living\simple_mob\donteatpets_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\hands.dm" #include "code\modules\mob\living\simple_mob\harvesting.dm" #include "code\modules\mob\living\simple_mob\life.dm" @@ -3698,17 +3138,11 @@ #include "code\modules\mob\living\simple_mob\sd_pets.dm" #include "code\modules\mob\living\simple_mob\simple_hud.dm" #include "code\modules\mob\living\simple_mob\simple_mob.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\simple_mob_ch.dm" #include "code\modules\mob\living\simple_mob\simple_mob_vr.dm" #include "code\modules\mob\living\simple_mob\taming.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\vox.dm" -======= -#include "code\modules\mob\living\simple_mob\simple_mob_vr.dm" -#include "code\modules\mob\living\simple_mob\taming.dm" -#include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\catslug.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\jellyfish.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\skeleton.dm" @@ -3738,33 +3172,22 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\thermic.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\tunneler.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\webslinger.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\hyena\hyena.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\armadillo_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\crab.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\jerboa_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard_mutant_event.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse_mutant_event.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm" -#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\passive.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\penguin.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\possum.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\raccoon_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\cat.dm" @@ -3789,30 +3212,22 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\sif.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\siffet.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\space\animals_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bats.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bear.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\gaslamp_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\mouse_army_ch.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\animal\space\snake_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\worm.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\horror\bradley.dm" #include "code\modules\mob\living\simple_mob\subtypes\horror\Eddy.dm" #include "code\modules\mob\living\simple_mob\subtypes\horror\horror .dm" @@ -3838,17 +3253,6 @@ #include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\corrupt_maint_drone_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\cyber_horror_ch.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\clown.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid_vr.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_vr.dm" -#include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm" -#include "code\modules\mob\living\simple_mob\subtypes\mechanical\corrupt_maint_drone_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\mechanical\disbot_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem_vr.dm" @@ -3878,7 +3282,6 @@ #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\ripley.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\ward\monitor_ward.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\ward\ward.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\metroid\metAI.dm" #include "code\modules\mob\living\simple_mob\subtypes\metroid\metBaseType.dm" #include "code\modules\mob\living\simple_mob\subtypes\metroid\metConsumption.dm" @@ -3889,11 +3292,6 @@ #include "code\modules\mob\living\simple_mob\subtypes\occult\faithless.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\_construct.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\_construct_ch.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\occult\creature.dm" -#include "code\modules\mob\living\simple_mob\subtypes\occult\faithless.dm" -#include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\_construct.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\artificer.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\harvester.dm" #include "code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm" @@ -3916,10 +3314,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\c_pet.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\catgirl.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\chungus.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\cookiegirl.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\corrupt_hounds.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\deathclaw.dm" @@ -3928,49 +3323,32 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\fennec.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\fennix.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\frog.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\goia_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\greatwolf.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\hippo.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\horse.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\jelly.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\lamia.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\leopardmander_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\lizardman.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mimic.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mimic_ch.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\vore\leopardmander.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mimic.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\oregrub.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\otie.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\panther.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\rabbit.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\rat.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\rat_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\sect_drone.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\sect_queen.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\sheep.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\slug_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\snake.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\softdog.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub_larva.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\solarmoth_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\weretiger.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm" @@ -3980,16 +3358,12 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\_defines.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_abilities.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_abilities_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demonAI_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demonAI_subtypes_ch.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\~defines.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Big.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\bigclowns.dm" @@ -4001,7 +3375,6 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\honkelemental.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\regularclowns.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\morph\morph.dm" -<<<<<<< HEAD #include "code\modules\mob\living\simple_mob\subtypes\vore\plants_ch\pitcher.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_procs.dm" @@ -4015,15 +3388,6 @@ #include "code\modules\mob\living\voice\voice_vr.dm" #include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\login_ch.dm" -======= -#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_procs.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\shadekin.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types.dm" -#include "code\modules\mob\living\voice\voice.dm" -#include "code\modules\mob\living\voice\voice_vr.dm" -#include "code\modules\mob\new_player\login.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\mob\new_player\login_vr.dm" #include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\new_player.dm" @@ -4035,7 +3399,6 @@ #include "code\modules\mob\new_player\skill.dm" #include "code\modules\mob\new_player\sprite_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories_ear.dm" -<<<<<<< HEAD #include "code\modules\mob\new_player\sprite_accessories_ear_ch.dm" #include "code\modules\mob\new_player\sprite_accessories_ear_vr.dm" #include "code\modules\mob\new_player\sprite_accessories_extra.dm" @@ -4052,18 +3415,6 @@ #include "code\modules\mob\new_player\sprite_accessories_wing_ch.dm" #include "code\modules\mob\new_player\sprite_accessories_wing_vr.dm" #include "code\modules\mob\new_player\sprite_accessories_yw.dm" -======= -#include "code\modules\mob\new_player\sprite_accessories_ear_vr.dm" -#include "code\modules\mob\new_player\sprite_accessories_extra.dm" -#include "code\modules\mob\new_player\sprite_accessories_extra_vr.dm" -#include "code\modules\mob\new_player\sprite_accessories_tail.dm" -#include "code\modules\mob\new_player\sprite_accessories_tail_vr.dm" -#include "code\modules\mob\new_player\sprite_accessories_taur.dm" -#include "code\modules\mob\new_player\sprite_accessories_taur_vr.dm" -#include "code\modules\mob\new_player\sprite_accessories_vr.dm" -#include "code\modules\mob\new_player\sprite_accessories_wing.dm" -#include "code\modules\mob\new_player\sprite_accessories_wing_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\modular_computers\laptop_vendor.dm" #include "code\modules\modular_computers\computers\modular_computer\core.dm" #include "code\modules\modular_computers\computers\modular_computer\damage.dm" @@ -4132,10 +3483,6 @@ #include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm" #include "code\modules\multi-tile\multi-tile.dm" #include "code\modules\multiz\_stubs.dm" -<<<<<<< HEAD -======= -#include "code\modules\multiz\admin_upload.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\multiz\basic.dm" #include "code\modules\multiz\hoist.dm" #include "code\modules\multiz\ladder_assembly_vr.dm" @@ -4147,7 +3494,6 @@ #include "code\modules\multiz\portals_vr.dm" #include "code\modules\multiz\stairs.dm" #include "code\modules\multiz\turf.dm" -<<<<<<< HEAD #include "code\modules\multiz\turf_yw.dm" #include "code\modules\nano\nanoexternal.dm" #include "code\modules\nano\nanomanager.dm" @@ -4168,8 +3514,6 @@ #include "code\modules\nano\interaction\remote.dm" #include "code\modules\nano\interaction\self.dm" #include "code\modules\nano\interaction\zlevel.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\news\news_init.dm" #include "code\modules\news\newspaper.dm" #include "code\modules\news\newspaper_layout.dm" @@ -4190,7 +3534,6 @@ #include "code\modules\organs\organ_external.dm" #include "code\modules\organs\organ_external_vr.dm" #include "code\modules\organs\organ_icon.dm" -<<<<<<< HEAD #include "code\modules\organs\organ_icon_ch.dm" #include "code\modules\organs\organ_stump.dm" #include "code\modules\organs\pain.dm" @@ -4199,13 +3542,6 @@ #include "code\modules\organs\robolimbs_custom.dm" #include "code\modules\organs\robolimbs_vr.dm" #include "code\modules\organs\robolimbs_yw.dm" -======= -#include "code\modules\organs\organ_stump.dm" -#include "code\modules\organs\pain.dm" -#include "code\modules\organs\robolimbs.dm" -#include "code\modules\organs\robolimbs_custom.dm" -#include "code\modules\organs\robolimbs_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\organs\wound.dm" #include "code\modules\organs\internal\_organ_internal.dm" #include "code\modules\organs\internal\appendix.dm" @@ -4217,10 +3553,7 @@ #include "code\modules\organs\internal\kidneys.dm" #include "code\modules\organs\internal\liver.dm" #include "code\modules\organs\internal\lungs.dm" -<<<<<<< HEAD #include "code\modules\organs\internal\lungs_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\organs\internal\spleen.dm" #include "code\modules\organs\internal\stomach.dm" #include "code\modules\organs\internal\voicebox.dm" @@ -4293,10 +3626,7 @@ #include "code\modules\paperwork\paper.dm" #include "code\modules\paperwork\paper_bundle.dm" #include "code\modules\paperwork\paper_sticky.dm" -<<<<<<< HEAD #include "code\modules\paperwork\paper_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\paperwork\paperbin.dm" #include "code\modules\paperwork\paperplane.dm" #include "code\modules\paperwork\papershredder.dm" @@ -4322,10 +3652,7 @@ #include "code\modules\persistence\filth.dm" #include "code\modules\persistence\graffiti.dm" #include "code\modules\persistence\noticeboard.dm" -<<<<<<< HEAD #include "code\modules\persistence\noticeboard_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\persistence\paintings.dm" #include "code\modules\persistence\serialize.dm" #include "code\modules\persistence\datum\persistence_datum.dm" @@ -4337,16 +3664,9 @@ #include "code\modules\persistence\storage\smartfridge.dm" #include "code\modules\persistence\storage\storage.dm" #include "code\modules\planet\planet.dm" -<<<<<<< HEAD #include "code\modules\planet\sif.dm" #include "code\modules\planet\sun.dm" #include "code\modules\planet\time.dm" -======= -#include "code\modules\planet\sun.dm" -#include "code\modules\planet\time.dm" -#include "code\modules\planet\virgo3b_vr.dm" -#include "code\modules\planet\virgo4_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\planet\weather.dm" #include "code\modules\planet\weather_vr.dm" #include "code\modules\power\apc.dm" @@ -4360,10 +3680,7 @@ #include "code\modules\power\cell.dm" #include "code\modules\power\debug_items.dm" #include "code\modules\power\generator.dm" -<<<<<<< HEAD #include "code\modules\power\generator_yw.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\power\gravitygenerator_vr.dm" #include "code\modules\power\grid_checker.dm" #include "code\modules\power\lighting.dm" @@ -4396,10 +3713,7 @@ #include "code\modules\power\fusion\core\core_control.dm" #include "code\modules\power\fusion\core\core_field.dm" #include "code\modules\power\fusion\fuel_assembly\fuel_assembly.dm" -<<<<<<< HEAD #include "code\modules\power\fusion\fuel_assembly\fuel_assembly_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\power\fusion\fuel_assembly\fuel_compressor.dm" #include "code\modules\power\fusion\fuel_assembly\fuel_control.dm" #include "code\modules\power\fusion\fuel_assembly\fuel_injector.dm" @@ -4434,10 +3748,10 @@ #include "code\modules\projectiles\broken.dm" #include "code\modules\projectiles\dnalocking.dm" #include "code\modules\projectiles\gun.dm" -<<<<<<< HEAD #include "code\modules\projectiles\gun_ch.dm" #include "code\modules\projectiles\projectile.dm" #include "code\modules\projectiles\projectile_ch.dm" +#include "code\modules\projectiles\ammunition\ammo_boxes.dm" #include "code\modules\projectiles\ammunition\magazines.dm" #include "code\modules\projectiles\ammunition\magazines_vr.dm" #include "code\modules\projectiles\ammunition\magazines_yw.dm" @@ -4449,15 +3763,6 @@ #include "code\modules\projectiles\ammunition\zz_autolathe_ch.dm" #include "code\modules\projectiles\ammunition\zz_magazines_ch.dm" #include "code\modules\projectiles\ammunition\zz_rounds_ch.dm" -======= -#include "code\modules\projectiles\projectile.dm" -#include "code\modules\projectiles\ammunition\ammo_boxes.dm" -#include "code\modules\projectiles\ammunition\magazines.dm" -#include "code\modules\projectiles\ammunition\magazines_vr.dm" -#include "code\modules\projectiles\ammunition\magnetic.dm" -#include "code\modules\projectiles\ammunition\rounds.dm" -#include "code\modules\projectiles\ammunition\smartmag.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\brokenguns\energy.dm" #include "code\modules\projectiles\brokenguns\launcher.dm" #include "code\modules\projectiles\brokenguns\magnetic.dm" @@ -4467,11 +3772,8 @@ #include "code\modules\projectiles\guns\magic.dm" #include "code\modules\projectiles\guns\modular_guns.dm" #include "code\modules\projectiles\guns\projectile.dm" -<<<<<<< HEAD #include "code\modules\projectiles\guns\projectile_ch.dm" -======= #include "code\modules\projectiles\guns\toy.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\vox.dm" #include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm" #include "code\modules\projectiles\guns\energy\crestrose_vr.dm" @@ -4480,7 +3782,6 @@ #include "code\modules\projectiles\guns\energy\hooklauncher.dm" #include "code\modules\projectiles\guns\energy\kinetic_accelerator_vr.dm" #include "code\modules\projectiles\guns\energy\laser.dm" -<<<<<<< HEAD #include "code\modules\projectiles\guns\energy\laser_ch.dm" #include "code\modules\projectiles\guns\energy\laser_vr.dm" #include "code\modules\projectiles\guns\energy\laser_yw.dm" @@ -4488,12 +3789,6 @@ #include "code\modules\projectiles\guns\energy\netgun_yw.dm" #include "code\modules\projectiles\guns\energy\nuclear.dm" #include "code\modules\projectiles\guns\energy\nuclear_yw.dm" -======= -#include "code\modules\projectiles\guns\energy\laser_vr.dm" -#include "code\modules\projectiles\guns\energy\netgun_vr.dm" -#include "code\modules\projectiles\guns\energy\nuclear.dm" -#include "code\modules\projectiles\guns\energy\nuclear_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\energy\particle.dm" #include "code\modules\projectiles\guns\energy\phase.dm" #include "code\modules\projectiles\guns\energy\protector_vr.dm" @@ -4506,7 +3801,6 @@ #include "code\modules\projectiles\guns\energy\stun_vr.dm" #include "code\modules\projectiles\guns\energy\temperature.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\cell_loaded.dm" -<<<<<<< HEAD #include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon_cells.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nerd.dm" @@ -4515,15 +3809,6 @@ #include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw_cells.dm" #include "code\modules\projectiles\guns\launcher\bows.dm" #include "code\modules\projectiles\guns\launcher\confetti_ch.dm" -======= -#include "code\modules\projectiles\guns\energy\cell_loaded_vr\ml3m.dm" -#include "code\modules\projectiles\guns\energy\cell_loaded_vr\ml3m_cells.dm" -#include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon.dm" -#include "code\modules\projectiles\guns\energy\cell_loaded_vr\multi_cannon_cells.dm" -#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw.dm" -#include "code\modules\projectiles\guns\energy\cell_loaded_vr\nsfw_cells.dm" -#include "code\modules\projectiles\guns\launcher\bows.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\launcher\crossbow.dm" #include "code\modules\projectiles\guns\launcher\grenade_launcher.dm" #include "code\modules\projectiles\guns\launcher\pneumatic.dm" @@ -4535,7 +3820,6 @@ #include "code\modules\projectiles\guns\magnetic\magnetic.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_construction.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_railgun.dm" -<<<<<<< HEAD #include "code\modules\projectiles\guns\magnetic\magnetic_railgun_ch.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_railgun_vr.dm" #include "code\modules\projectiles\guns\projectile\automatic.dm" @@ -4544,12 +3828,6 @@ #include "code\modules\projectiles\guns\projectile\automatic_yw.dm" #include "code\modules\projectiles\guns\projectile\boltaction.dm" #include "code\modules\projectiles\guns\projectile\boltaction_ch.dm" -======= -#include "code\modules\projectiles\guns\magnetic\magnetic_railgun_vr.dm" -#include "code\modules\projectiles\guns\projectile\automatic.dm" -#include "code\modules\projectiles\guns\projectile\automatic_vr.dm" -#include "code\modules\projectiles\guns\projectile\boltaction.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\guns\projectile\boltaction_vr.dm" #include "code\modules\projectiles\guns\projectile\caseless.dm" #include "code\modules\projectiles\guns\projectile\contender.dm" @@ -4557,7 +3835,6 @@ #include "code\modules\projectiles\guns\projectile\dartgun_vr.dm" #include "code\modules\projectiles\guns\projectile\pistol.dm" #include "code\modules\projectiles\guns\projectile\pistol_vr.dm" -<<<<<<< HEAD #include "code\modules\projectiles\guns\projectile\pistol_yw.dm" #include "code\modules\projectiles\guns\projectile\revolver.dm" #include "code\modules\projectiles\guns\projectile\revolver_vr.dm" @@ -4584,34 +3861,12 @@ #include "code\modules\projectiles\projectile\energy_ch.dm" #include "code\modules\projectiles\projectile\energy_vr.dm" #include "code\modules\projectiles\projectile\energy_yw.dm" -======= -#include "code\modules\projectiles\guns\projectile\revolver.dm" -#include "code\modules\projectiles\guns\projectile\revolver_vr.dm" -#include "code\modules\projectiles\guns\projectile\semiauto.dm" -#include "code\modules\projectiles\guns\projectile\shotgun.dm" -#include "code\modules\projectiles\guns\projectile\shotgun_vr.dm" -#include "code\modules\projectiles\guns\projectile\smartgun.dm" -#include "code\modules\projectiles\guns\projectile\sniper.dm" -#include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm" -#include "code\modules\projectiles\projectile\arc.dm" -#include "code\modules\projectiles\projectile\beams.dm" -#include "code\modules\projectiles\projectile\beams_vr.dm" -#include "code\modules\projectiles\projectile\blob.dm" -#include "code\modules\projectiles\projectile\bullets.dm" -#include "code\modules\projectiles\projectile\bullets_vr.dm" -#include "code\modules\projectiles\projectile\change.dm" -#include "code\modules\projectiles\projectile\energy.dm" -#include "code\modules\projectiles\projectile\energy_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\projectile\explosive.dm" #include "code\modules\projectiles\projectile\force.dm" #include "code\modules\projectiles\projectile\hook.dm" #include "code\modules\projectiles\projectile\magic.dm" #include "code\modules\projectiles\projectile\magnetic.dm" -<<<<<<< HEAD #include "code\modules\projectiles\projectile\magnetic_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\projectiles\projectile\pellets.dm" #include "code\modules\projectiles\projectile\scatter.dm" #include "code\modules\projectiles\projectile\special.dm" @@ -4643,10 +3898,7 @@ #include "code\modules\reagents\Chemistry-Metabolism.dm" #include "code\modules\reagents\holder\distilling.dm" #include "code\modules\reagents\holder\holder.dm" -<<<<<<< HEAD #include "code\modules\reagents\holder\holder_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\hoses\connector.dm" #include "code\modules\reagents\hoses\hose.dm" #include "code\modules\reagents\hoses\hose_connector.dm" @@ -4654,17 +3906,11 @@ #include "code\modules\reagents\machinery\chemalyzer.dm" #include "code\modules\reagents\machinery\distillery.dm" #include "code\modules\reagents\machinery\grinder.dm" -<<<<<<< HEAD -#include "code\modules\reagents\machinery\dispenser\_defines.dm" -#include "code\modules\reagents\machinery\dispenser\cartridge.dm" -#include "code\modules\reagents\machinery\dispenser\cartridge_presets.dm" -#include "code\modules\reagents\machinery\dispenser\cartridge_presets_ch.dm" -======= #include "code\modules\reagents\machinery\pump.dm" #include "code\modules\reagents\machinery\dispenser\_defines.dm" #include "code\modules\reagents\machinery\dispenser\cartridge.dm" #include "code\modules\reagents\machinery\dispenser\cartridge_presets.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix +#include "code\modules\reagents\machinery\dispenser\cartridge_presets_ch.dm" #include "code\modules\reagents\machinery\dispenser\cartridge_presets_vr.dm" #include "code\modules\reagents\machinery\dispenser\cartridge_spawn.dm" #include "code\modules\reagents\machinery\dispenser\dispenser2.dm" @@ -4672,16 +3918,12 @@ #include "code\modules\reagents\machinery\dispenser\dispenser_presets.dm" #include "code\modules\reagents\machinery\dispenser\dispenser_presets_vr.dm" #include "code\modules\reagents\machinery\dispenser\reagent_tank.dm" -<<<<<<< HEAD #include "code\modules\reagents\machinery\dispenser\reagent_tank_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\machinery\dispenser\supply.dm" #include "code\modules\reagents\reactions\_reactions.dm" #include "code\modules\reagents\reactions\distilling\distilling.dm" #include "code\modules\reagents\reactions\fusion\fusion.dm" #include "code\modules\reagents\reactions\instant\drinks.dm" -<<<<<<< HEAD #include "code\modules\reagents\reactions\instant\drinks_ch.dm" #include "code\modules\reagents\reactions\instant\drinks_vr.dm" #include "code\modules\reagents\reactions\instant\food.dm" @@ -4689,12 +3931,6 @@ #include "code\modules\reagents\reactions\instant\food_vr.dm" #include "code\modules\reagents\reactions\instant\instant.dm" #include "code\modules\reagents\reactions\instant\instant_ch.dm" -======= -#include "code\modules\reagents\reactions\instant\drinks_vr.dm" -#include "code\modules\reagents\reactions\instant\food.dm" -#include "code\modules\reagents\reactions\instant\food_vr.dm" -#include "code\modules\reagents\reactions\instant\instant.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\reactions\instant\instant_vr.dm" #include "code\modules\reagents\reagent_containers\_reagent_containers.dm" #include "code\modules\reagents\reagent_containers\blood_pack.dm" @@ -4713,16 +3949,12 @@ #include "code\modules\reagents\reagent_containers\syringes.dm" #include "code\modules\reagents\reagent_containers\syringes_vr.dm" #include "code\modules\reagents\reagent_containers\unidentified_hypospray.dm" -<<<<<<< HEAD #include "code\modules\reagents\reagent_containers\food\drinks\bluespacecoffee.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\reagents\_helpers.dm" #include "code\modules\reagents\reagents\_reagents.dm" #include "code\modules\reagents\reagents\core.dm" #include "code\modules\reagents\reagents\dispenser.dm" #include "code\modules\reagents\reagents\food_drinks.dm" -<<<<<<< HEAD #include "code\modules\reagents\reagents\food_drinks_ch.dm" #include "code\modules\reagents\reagents\food_drinks_vr.dm" #include "code\modules\reagents\reagents\medicine.dm" @@ -4734,15 +3966,6 @@ #include "code\modules\reagents\reagents\other_vr.dm" #include "code\modules\reagents\reagents\toxins.dm" #include "code\modules\reagents\reagents\vore_ch.dm" -======= -#include "code\modules\reagents\reagents\food_drinks_vr.dm" -#include "code\modules\reagents\reagents\medicine.dm" -#include "code\modules\reagents\reagents\medicine_vr.dm" -#include "code\modules\reagents\reagents\modifiers.dm" -#include "code\modules\reagents\reagents\other.dm" -#include "code\modules\reagents\reagents\other_vr.dm" -#include "code\modules\reagents\reagents\toxins.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\reagents\reagents\vore_vr.dm" #include "code\modules\recycling\conveyor2.dm" #include "code\modules\recycling\disposal-construction.dm" @@ -4753,10 +3976,7 @@ #include "code\modules\research\designs.dm" #include "code\modules\research\destructive_analyzer.dm" #include "code\modules\research\mechfab_designs.dm" -<<<<<<< HEAD #include "code\modules\research\mechfab_designs_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\research\message_server.dm" #include "code\modules\research\prosfab_designs.dm" #include "code\modules\research\prosfab_designs_vr.dm" @@ -4793,45 +4013,30 @@ #include "code\modules\research\designs\subspace_parts.dm" #include "code\modules\research\designs\tech_disks.dm" #include "code\modules\research\designs\weapons.dm" -<<<<<<< HEAD #include "code\modules\research\designs\weapons_ch.dm" #include "code\modules\research\designs\weapons_vr.dm" #include "code\modules\research\designs\weapons_yw.dm" -======= -#include "code\modules\research\designs\weapons_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\research\designs\xenoarch_toys.dm" #include "code\modules\research\designs\xenobio_toys.dm" #include "code\modules\research\designs\circuits\ai_modules.dm" #include "code\modules\research\designs\circuits\ai_modules_vr.dm" #include "code\modules\research\designs\circuits\circuits.dm" -<<<<<<< HEAD #include "code\modules\research\designs\circuits\circuits_ch.dm" #include "code\modules\research\designs\circuits\circuits_vr.dm" #include "code\modules\research\designs\circuits\circuits_yw.dm" -======= -#include "code\modules\research\designs\circuits\circuits_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\research\designs\circuits\disks.dm" #include "code\modules\resleeving\circuitboards.dm" #include "code\modules\resleeving\computers.dm" #include "code\modules\resleeving\designer.dm" #include "code\modules\resleeving\documents.dm" #include "code\modules\resleeving\implant.dm" -<<<<<<< HEAD #include "code\modules\resleeving\implant_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\resleeving\infocore_records.dm" #include "code\modules\resleeving\infomorph.dm" #include "code\modules\resleeving\infomorph_software.dm" #include "code\modules\resleeving\machine_subtypes.dm" #include "code\modules\resleeving\machines.dm" -<<<<<<< HEAD #include "code\modules\resleeving\machines_ch.dm" -======= -#include "code\modules\resleeving\resleeving_sickness.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\resleeving\sleevecard.dm" #include "code\modules\rogueminer_vr\asteroid.dm" #include "code\modules\rogueminer_vr\controller.dm" @@ -4881,10 +4086,7 @@ #include "code\modules\shuttles\escape_pods.dm" #include "code\modules\shuttles\landmarks.dm" #include "code\modules\shuttles\shuttle.dm" -<<<<<<< HEAD #include "code\modules\shuttles\shuttle_arrivals.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\shuttles\shuttle_autodock.dm" #include "code\modules\shuttles\shuttle_console.dm" #include "code\modules\shuttles\shuttle_console_multi.dm" @@ -4954,10 +4156,7 @@ #include "code\modules\telesci\bscyrstal.dm" #include "code\modules\telesci\construction.dm" #include "code\modules\telesci\gps_advanced.dm" -<<<<<<< HEAD #include "code\modules\telesci\hyper_pad_ch.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\telesci\quantum_pad.dm" #include "code\modules\telesci\telepad.dm" #include "code\modules\telesci\telesci_computer.dm" @@ -5031,10 +4230,7 @@ #include "code\modules\vehicles\cargo_train.dm" #include "code\modules\vehicles\construction.dm" #include "code\modules\vehicles\quad.dm" -<<<<<<< HEAD #include "code\modules\vehicles\Securitrain_vr.dm" -======= ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\vehicles\train.dm" #include "code\modules\vehicles\vehicle.dm" #include "code\modules\ventcrawl\ventcrawl.dm" @@ -5057,22 +4253,16 @@ #include "code\modules\vore\hook-defs_vr.dm" #include "code\modules\vore\trycatch_vr.dm" #include "code\modules\vore\appearance\preferences_vr.dm" -<<<<<<< HEAD #include "code\modules\vore\appearance\sprite_accessories_taur_yw.dm" #include "code\modules\vore\appearance\sprite_accessories_yw.dm" #include "code\modules\vore\appearance\update_icons_vr.dm" #include "code\modules\vore\eating\belly_dat_vr.dm" #include "code\modules\vore\eating\belly_obj_ch.dm" -======= -#include "code\modules\vore\appearance\update_icons_vr.dm" -#include "code\modules\vore\eating\belly_dat_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\vore\eating\belly_obj_vr.dm" #include "code\modules\vore\eating\bellymodes_datum_vr.dm" #include "code\modules\vore\eating\bellymodes_vr.dm" #include "code\modules\vore\eating\contaminate_vr.dm" #include "code\modules\vore\eating\digest_act_vr.dm" -<<<<<<< HEAD #include "code\modules\vore\eating\leave_remains_vr.dm" #include "code\modules\vore\eating\living_ch.dm" #include "code\modules\vore\eating\living_vr.dm" @@ -5101,24 +4291,6 @@ #include "code\modules\vore\persist\persist_vr.dm" #include "code\modules\vore\resizing\grav_pull_vr.dm" #include "code\modules\vore\resizing\holder_micro_ch.dm" -======= -#include "code\modules\vore\eating\inbelly_spawn.dm" -#include "code\modules\vore\eating\leave_remains_vr.dm" -#include "code\modules\vore\eating\living_vr.dm" -#include "code\modules\vore\eating\silicon_vr.dm" -#include "code\modules\vore\eating\simple_animal_vr.dm" -#include "code\modules\vore\eating\transforming_vr.dm" -#include "code\modules\vore\eating\vore_vr.dm" -#include "code\modules\vore\eating\vorehooks_vr.dm" -#include "code\modules\vore\eating\vorepanel_vr.dm" -#include "code\modules\vore\fluffstuff\custom_boxes_vr.dm" -#include "code\modules\vore\fluffstuff\custom_clothes_vr.dm" -#include "code\modules\vore\fluffstuff\custom_items_vr.dm" -#include "code\modules\vore\fluffstuff\custom_mecha_vr.dm" -#include "code\modules\vore\fluffstuff\custom_permits_vr.dm" -#include "code\modules\vore\persist\persist_vr.dm" -#include "code\modules\vore\resizing\grav_pull_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\vore\resizing\holder_micro_vr.dm" #include "code\modules\vore\resizing\resize_vr.dm" #include "code\modules\vore\resizing\sizegun_vr.dm" @@ -5134,10 +4306,7 @@ #include "code\modules\xenoarcheaology\anomaly_container.dm" #include "code\modules\xenoarcheaology\boulder.dm" #include "code\modules\xenoarcheaology\effect.dm" -<<<<<<< HEAD -======= #include "code\modules\xenoarcheaology\effect_master.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\xenoarcheaology\manuals.dm" #include "code\modules\xenoarcheaology\misc.dm" #include "code\modules\xenoarcheaology\sampling.dm" @@ -5183,11 +4352,7 @@ #include "code\modules\xenoarcheaology\effects\teleport.dm" #include "code\modules\xenoarcheaology\effects\vampire.dm" #include "code\modules\xenoarcheaology\finds\eguns.dm" -<<<<<<< HEAD #include "code\modules\xenoarcheaology\finds\eguns_vr_ch.dm" -======= -#include "code\modules\xenoarcheaology\finds\eguns_vr.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "code\modules\xenoarcheaology\finds\find_spawning.dm" #include "code\modules\xenoarcheaology\finds\finds.dm" #include "code\modules\xenoarcheaology\finds\finds_defines.dm" @@ -5248,24 +4413,16 @@ #include "code\ZAS\Zone.dm" #include "interface\interface.dm" #include "interface\skin.dmf" -<<<<<<< HEAD #include "maps\gateway_archive_vr\blackmarketpackers.dm" #include "maps\southern_cross\southern_cross.dm" #include "maps\southern_cross\items\encryptionkey_sc.dm" #include "maps\southern_cross\items\headset_sc.dm" -======= -#include "maps\expedition_vr\beach\submaps\mountains.dm" -#include "maps\expedition_vr\beach\submaps\mountains_areas.dm" -#include "maps\gateway_archive_vr\blackmarketpackers.dm" -#include "maps\offmap_vr\om_ships\abductor.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" #include "maps\southern_cross\items\clothing\sc_under.dm" #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -<<<<<<< HEAD #include "maps\southern_cross\overmap\shuttles.dm" #include "maps\southern_cross\structures\closets\engineering.dm" #include "maps\southern_cross\structures\closets\medical.dm" @@ -5273,16 +4430,10 @@ #include "maps\southern_cross\structures\closets\research.dm" #include "maps\southern_cross\structures\closets\security.dm" #include "maps\submaps\_helpers.dm" -======= -#include "maps\stellardelight\stellar_delight.dm" -#include "maps\submaps\_helpers.dm" -#include "maps\submaps\_readme.dm" ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix #include "maps\submaps\engine_submaps\engine.dm" #include "maps\submaps\engine_submaps\engine_areas.dm" #include "maps\submaps\engine_submaps_vr\tether\_engine_submaps.dm" #include "maps\submaps\space_submaps\space.dm" -<<<<<<< HEAD #include "maps\submaps\space_submaps\space_areas.dm" #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\mountains\mountains.dm" @@ -5294,10 +4445,3 @@ #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE -======= -#include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" -#include "maps\submaps\surface_submaps\wilderness\wilderness.dm" -#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" -#include "maps\~map_system\maps.dm" -// END_INCLUDE ->>>>>>> 4f752bf068f... Merge pull request #12292 from Heroman3003/8316-fix From 7befce4043f414a2592ec7b064d30ee7335d4730 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Mon, 28 Feb 2022 23:10:45 -0700 Subject: [PATCH 3/3] powder that makes you say yes --- vorestation.dme | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vorestation.dme b/vorestation.dme index 7ae79d8606..8cdff168cd 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2517,7 +2517,6 @@ #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\grown_inedible.dm" #include "code\modules\hydroponics\grown_predefined.dm" -#include "code\modules\hydroponics\grown_sif.dm" #include "code\modules\hydroponics\seed.dm" #include "code\modules\hydroponics\seed_datums_ch.dm" #include "code\modules\hydroponics\seed_datums_vr.dm" @@ -3751,7 +3750,6 @@ #include "code\modules\projectiles\gun_ch.dm" #include "code\modules\projectiles\projectile.dm" #include "code\modules\projectiles\projectile_ch.dm" -#include "code\modules\projectiles\ammunition\ammo_boxes.dm" #include "code\modules\projectiles\ammunition\magazines.dm" #include "code\modules\projectiles\ammunition\magazines_vr.dm" #include "code\modules\projectiles\ammunition\magazines_yw.dm" @@ -3773,7 +3771,6 @@ #include "code\modules\projectiles\guns\modular_guns.dm" #include "code\modules\projectiles\guns\projectile.dm" #include "code\modules\projectiles\guns\projectile_ch.dm" -#include "code\modules\projectiles\guns\toy.dm" #include "code\modules\projectiles\guns\vox.dm" #include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm" #include "code\modules\projectiles\guns\energy\crestrose_vr.dm" @@ -4306,7 +4303,6 @@ #include "code\modules\xenoarcheaology\anomaly_container.dm" #include "code\modules\xenoarcheaology\boulder.dm" #include "code\modules\xenoarcheaology\effect.dm" -#include "code\modules\xenoarcheaology\effect_master.dm" #include "code\modules\xenoarcheaology\manuals.dm" #include "code\modules\xenoarcheaology\misc.dm" #include "code\modules\xenoarcheaology\sampling.dm"