Merge branch 'master' into TGUI-Vote

.github/workflows/ci.yml

@@ -67,7 +67,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache SpacemanDMM
+      - name: Restore SpacemanDMM Cache
         uses: actions/cache@v4
         with:
           path: ~/SpacemanDMM
@@ -92,7 +92,7 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        map: ['tether', 'stellar_delight', 'groundbase']
+        map: ['USE_MAP_TETHER', 'USE_MAP_STELLARDELIGHT', 'USE_MAP_GROUNDBASE']
     # name: Integration Tests (${{ matrix.map }})
     name: Integration Tests
     # needs: ['run_linters', 'dreamchecker']
@@ -102,10 +102,10 @@ jobs:
       - name: Ensure +x on CI directory
         run: |
           chmod -R +x ./tools/ci
-      - name: Setup Cache
+      - name: Restore BYOND Cache
         uses: actions/cache@v4
         with:
-          path: $HOME/BYOND
+          path: $HOME/byond
           key: ${{ runner.os }}-byond
       - name: Install RUST_G Dependencies
         run: |
@@ -118,35 +118,38 @@ jobs:
           tools/ci/install_byond.sh
           tools/ci/compile_and_run.sh
         env:
-          TEST_DEFINE: "UNIT_TEST"
-          TEST_FILE: "code/_unit_tests.dm"
-          MAP: ${{ matrix.map }}
-          REPLACE: true
+          EXTRA_ARGS: "-DUNIT_TEST -D${{ matrix.map }}"
           RUN: "1"
-      - name: Compile POIs
+
+  extra_map_tests:
+    name: Map Tests
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Ensure +x on CI directory
         run: |
-          tools/ci/install_byond.sh
-          tools/ci/compile_and_run.sh
+          chmod -R +x ./tools/ci
+      - name: Restore BYOND Cache
+        uses: actions/cache@v4
+        with:
+          path: $HOME/byond
+          key: ${{ runner.os }}-byond
+      - name: Install BYOND
+        run: tools/ci/install_byond.sh
+      - name: Compile POIs
+        run: tools/ci/compile_and_run.sh
         env:
-          TEST_DEFINE: "MAP_TEST"
-          TEST_FILE: "code/_map_tests.dm"
-          MAP: ${{ matrix.map }}
-          REPLACE: false
+          EXTRA_ARGS: "-DMAP_TEST"
           RUN: "0"
       - name: Compile away missions
-        run: |
-          tools/ci/install_byond.sh
-          tools/ci/compile_and_run.sh
+        run: tools/ci/compile_and_run.sh
         env:
-          TEST_DEFINE: "AWAY_MISSION_TEST"
-          TEST_FILE: "code/_away_mission_tests.dm"
-          MAP: ${{ matrix.map }}
-          REPLACE: false
+          EXTRA_ARGS: "-DAWAY_MISSION_TEST -DUSE_MAP_TETHER" # Only Tether has support for all away missions
           RUN: "0"
 
   tests_successful:
     name: Integration Tests
-    needs: ['run_linters', 'dreamchecker', 'unit_tests']
+    needs: ['run_linters', 'dreamchecker', 'unit_tests', 'extra_map_tests']
     runs-on: ubuntu-20.04
     steps:
       - name: Report Success

.gitignore

@@ -34,3 +34,7 @@ package-lock.json
 
 # CBT Things
 .cache
+
+#These get built by some automatic process
+tgui/public/tgui.bundle.css
+tgui/public/tgui.bundle.js

code/__defines/_compile_options.dm

@@ -15,11 +15,16 @@
 // Movement Compile Options
 //#define CARDINAL_INPUT_ONLY // Uncomment to disable diagonal player movement (restore previous cardinal-moves-only behavior)
 
+// CI will override these as appropriate
+// #define MAP_TEST 0
+// #define AWAY_MISSION_TEST 0
+// #define UNIT_TEST 0
+
 // Comment/Uncomment this to turn off/on shuttle code debugging logs
 #define DEBUG_SHUTTLES
 
 // If we are doing the map test build, do not include the main maps, only the submaps.
-#if MAP_TEST
+#ifdef MAP_TEST
 	#define USING_MAP_DATUM /datum/map
 	#define MAP_OVERRIDE 1
 #endif

code/_away_mission_tests.dm

@@ -1,10 +0,0 @@
-/*
- *
- *   This file is used by CI to indicate that additional maps need to be compiled to look for errors such as missing paths.
- *   Do not add anything but the AWAY_MISSION_TEST definition here as it will be overwritten by CI when running tests.
- *
- *
- *   Should you wish to edit set AWAY_MISSION_TEST to 1 like so:
- *   #define AWAY_MISSION_TEST 1
- */
-#define AWAY_MISSION_TEST 0

code/_map_tests.dm

@@ -1,10 +0,0 @@
-/*
- *
- *   This file is used by CI to indicate that additional maps need to be compiled to look for errors such as missing paths.
- *   Do not add anything but the MAP_TEST definition here as it will be overwritten by CI when running tests.
- *
- *
- *   Should you wish to edit set MAP_TEST to 1 like so:
- *   #define MAP_TEST 1
- */
-#define MAP_TEST 0

code/_unit_tests.dm

@@ -1,10 +0,0 @@
-/*
- *
- *   This file is used by CI to indicate that Unit Tests are to be ran.
- *   Do not add anything but the UNIT_TEST definition here as it will be overwritten by CI when running tests.
- *
- *
- *   Should you wish to edit set UNIT_TEST to 1 like so:
- *   #define UNIT_TEST 1
- */
-#define UNIT_TEST 0

code/game/objects/items/weapons/id cards/cards.dm

@@ -277,9 +277,10 @@
 
 /obj/item/card/id/cargo/miner/borg/Initialize()
 	. = ..()
-	R = loc.loc
-	registered_name = R.braintype
-	RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc))
+	if(isrobot(loc?.loc))
+		R = loc.loc
+		registered_name = R.braintype
+		RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc))
 
 /obj/item/card/id/cargo/miner/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc)
 	if(old_loc == R || old_loc == R.module)
@@ -294,7 +295,8 @@
 			hud_layerise()
 
 /obj/item/card/id/cargo/miner/borg/Destroy()
-	UnregisterSignal(src, COMSIG_OBSERVER_MOVED)
-	R = null
-	last_robot_loc = null
+	if(R)
+		UnregisterSignal(src, COMSIG_OBSERVER_MOVED)
+		R = null
+		last_robot_loc = null
 	..()

code/game/world.dm

@@ -56,7 +56,7 @@
 
 	. = ..()
 
-#if UNIT_TEST
+#ifdef UNIT_TEST
 	log_unit_test("Unit Tests Enabled.  This will destroy the world when testing is complete.")
 	log_unit_test("If you did not intend to enable this please check code/__defines/unit_testing.dm")
 #endif
@@ -78,7 +78,7 @@
 
 	spawn(1)
 		master_controller.setup()
-#if UNIT_TEST
+#ifdef UNIT_TEST
 		initialize_unit_tests()
 #endif
 

code/modules/awaymissions/zlevel.dm

@@ -1,5 +1,8 @@
 /proc/createRandomZlevel()
-	if(awaydestinations.len || UNIT_TEST)	//crude, but it saves another var! //VOREStation Edit - No loading away missions during CI testing
+	#ifdef UNIT_TEST
+	return
+	#endif
+	if(awaydestinations.len)	//crude, but it saves another var! //VOREStation Edit - No loading away missions during CI testing
 		return
 
 	var/list/potentialRandomZlevels = list()

code/modules/client/preferences/migrations/15_nif_path.dm

@@ -0,0 +1,12 @@
+/// Moves nif stuff to it's own file
+/datum/preferences/proc/migration_15_nif_path(datum/json_savefile/S)
+	var/datum/json_savefile/new_savefile = new /datum/json_savefile(nif_savefile_path(client_ckey))
+
+	for(var/slot in 1 to config.character_slots)
+		var/list/prefs = new_savefile.get_entry("character[slot]", null)
+		if(!islist(prefs))
+			continue
+		prefs["nif_path"] = replacetext(prefs["nif_path"], "/device", "")
+		new_savefile.set_entry("character[slot]", prefs)
+
+	new_savefile.save()

code/modules/client/preferences_savefile.dm

@@ -1,5 +1,5 @@
 #define SAVEFILE_VERSION_MIN	8
-#define SAVEFILE_VERSION_MAX	14
+#define SAVEFILE_VERSION_MAX	15
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -59,6 +59,16 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		log_debug("[client_ckey] preferences successfully migrated from [current_version] to v14.")
 		to_chat(client, span_danger("v14 savefile migration complete."))
 
+	// Migration for nifs, again, to get rid of the /device path
+	if(current_version < 15)
+		log_debug("[client_ckey] preferences migrating from [current_version] to v15....")
+		to_chat(client, span_danger("Migrating savefile from version [current_version] to v15..."))
+
+		migration_15_nif_path(S)
+
+		log_debug("[client_ckey] preferences successfully migrated from [current_version] to v15.")
+		to_chat(client, span_danger("v15 savefile migration complete."))
+
 
 /datum/preferences/proc/update_character(current_version, list/save_data)
 	// Migration from BYOND savefiles to JSON: Important milemark.

code/modules/examine/descriptions/devices.dm

@@ -1,4 +1,4 @@
-/obj/item/device/communicator
+/obj/item/communicator
 	description_info = "This device allows someone to speak to another player sourced from the observer pool, as well as other communicators linked to it.  \
 	To use the device, use it in your hand, and it will open an interface with various buttons.  Near the bottom will be a list of devices currently available \
 	for you to call, both from communications on the station, and communicators very far away (observers).  To call someone, send a communications request to \
@@ -9,29 +9,29 @@
 	that is the Exonet.<br>\
 	<br>\
 	The Exonet is the predominant interstellar telecomm system, servicing trillions of devices across a large portion of human-controlled space.  \
-	It is distributed by a massive network of telecommunication satellites, some privately owned and others owned by the systems’ local governments, \
+	It is distributed by a massive network of telecommunication satellites, some privately owned and others owned by the systems� local governments, \
 	that utilize FTL technologies to bounce data between satellites at speeds that would not be possible at sub-light technology.  This communicator \
 	uses a protocol called Exonet Protocol Version 2, generally shortened to EPv2.<br>\
 	<br>\
 	EPv2 is the most common communications protocol in the Exonet, and was specifically designed for it.  It was designed to facilitate communication \
-	between any device in a star system, and have the ability to forward interstellar requests at the root node of that system’s Exonet.  \
+	between any device in a star system, and have the ability to forward interstellar requests at the root node of that system�s Exonet.  \
 	It is also built to cope with the reality that the numerous nodes in a system will likely have frequent outages.  The protocol allows for \
 	up to 18,446,744,073,709,551,616 unique addresses, one of which is assigned to this device."
 
 	description_antag = "Electromagnetic pulses will cause the device to disconnect all linked communicators.  Turning off the Exonet node at the Telecomms \
 	satellite will also accomplish this, but for all communicators on and near the station.  This may be needed to allow for a quiet kill or capture."
 
-/obj/item/device/electronic_assembly/device
+/obj/item/electronic_assembly/device
 	description_info = "This is the guts of a 'device' type electronic assembly, and can either be used in this form or can be used inside of the assembly to \
 	allow it to interact with other assembly type devices (igniter, signaler, proximity sensor, etc). This device has unique inputs that allow it to either send \
 	or receive pulsed signals from an attached items when inside an electronic assembly device frame (looks not unlike a signaler). Ensure the assembly is closed \
 	before placing it inside the frame."
 
-/obj/item/device/assembly/electronic_assembly
+/obj/item/assembly/electronic_assembly
 	description_info = "This is the casing for the 'device' type of electronic assembly. It behaves like any other 'assembly' type device such as an igniter or signaler \
 	and can be attached to others in the same way. Use the 'toggle-open' verb (right click) or a crowbar to pop the electronic device open to add components and close when finished."
 
-/obj/item/device/personal_shield_generator
+/obj/item/personal_shield_generator
 	description_info = "This is a personal shield generator. Depending on the type, it can either be worn on your backpack slot, your belt slot, or in a rigsuit \
 	storage slot. It runs on an internal battery, which is usually self-charging. Some versions come with a gun. To active the shield, click the button in the upper \
 	right of the screen, use the 'Toggle Shield' command under your objects tab, or click the device itself while it is on you. Some units come with an active weapon \
@@ -43,4 +43,4 @@
 	others. Most of the devices share the flaw that electrical attacks can easily overload the device and cause a shield failure, encouraging combatants to swap to \
 	the use of stun-based electric weaponry when shield generators are in use. Most shield devices are self-charging, running off a micro-nuclear reactor built into \
 	the chassis itself, although some variants exist without this capability and can have normal cells inserted into them. Larger units boast the capability of \
-	storing a weapon, although without upgraded batteries the usage of said weapon is ill-advised."
+	storing a weapon, although without upgraded batteries the usage of said weapon is ill-advised."

code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm

@@ -400,6 +400,49 @@
 			to_chat(user, "<span class='filter_notice'>It has [uses] lights remaining.</span>")
 			return
 
+/obj/item/dogborg/stasis_clamp
+	name = "stasis clamp"
+	desc = "A magnetic clamp which can halt the flow of gas in a pipe, via a localised stasis field."
+	icon = 'icons/atmos/clamp.dmi'
+	icon_state = "pclamp0"
+	var/max_clamps = 3
+	var/busy
+	var/list/clamps = list()
+
+/obj/item/dogborg/stasis_clamp/afterattack(var/atom/A, mob/user as mob, proximity)
+	if(!proximity)
+		return
+
+	if (istype(A, /obj/machinery/atmospherics/pipe/simple))
+		if(busy)
+			return
+		var/C = locate(/obj/machinery/clamp) in get_turf(A)
+		if(!C)
+			if(length(clamps) >= max_clamps)
+				to_chat(user, span_warning("You've already placed the maximum amount of [max_clamps] [src]s. Find and remove some before placing new ones."))
+				return
+			busy = TRUE
+			to_chat(user, span_notice("You begin to attach \the [C] to \the [A]..."))
+			if(do_after(user, 30))
+				to_chat(user, span_notice("You have attached \the [src] to \the [A]."))
+				var/obj/machinery/clamp/clamp = new/obj/machinery/clamp(A.loc, A)
+				clamps.Add(clamp)
+				if(isrobot(user))
+					var/mob/living/silicon/robot/R = user
+					R.use_direct_power(1000, 1500)
+		else
+			busy = TRUE
+			to_chat(user, span_notice("You begin to remove \the [C] from \the [A]..."))
+			if(do_after(user, 30))
+				to_chat(user, span_notice("You have removed \the [src] from \the [A]."))
+				clamps.Remove(C)
+				qdel(C)
+		busy = FALSE
+
+/obj/item/dogborg/stasis_clamp/Destroy()
+	clamps.Cut()
+	. = ..()
+
 //Pounce stuff for K-9
 /obj/item/dogborg/pounce
 	name = "pounce"

code/modules/mob/living/silicon/robot/robot_modules/station.dm

@@ -389,6 +389,7 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/rcd/electric/mounted/borg(src)
 	src.modules += new /obj/item/pickaxe/plasmacutter/borg(src)
 	src.modules += new /obj/item/gripper/no_use/loader(src)
+	src.modules += new /obj/item/dogborg/stasis_clamp(src)
 
 	var/datum/matter_synth/metal = new /datum/matter_synth/metal(40000)
 	var/datum/matter_synth/glass = new /datum/matter_synth/glass(40000)

code/modules/research/designs/mining_toys.dm

@@ -1,45 +1,45 @@
-/datum/design/item/weapon/mining/AssembleDesignName()
+/datum/design/item/mining/AssembleDesignName()
 	..()
 	name = "Mining equipment design ([item_name])"
 
 // Mining digging devices
 
-/datum/design/item/weapon/mining/drill
+/datum/design/item/mining/drill
 	id = "drill"
 	req_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1)
 	materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners.
 	build_path = /obj/item/pickaxe/drill
 	sort_string = "FAAAA"
 
-/datum/design/item/weapon/mining/advdrill
+/datum/design/item/mining/advdrill
 	id = "advanced_drill"
 	req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
 	materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
 	build_path = /obj/item/pickaxe/advdrill
 	sort_string = "FAAAB"
 
-/datum/design/item/weapon/mining/jackhammer
+/datum/design/item/mining/jackhammer
 	id = "jackhammer"
 	req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
 	materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500)
 	build_path = /obj/item/pickaxe/jackhammer
 	sort_string = "FAAAC"
 
-/datum/design/item/weapon/mining/plasmacutter
+/datum/design/item/mining/plasmacutter
 	id = "plasmacutter"
 	req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3)
 	materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500)
 	build_path = /obj/item/pickaxe/plasmacutter
 	sort_string = "FAAAD"
 
-/datum/design/item/weapon/mining/pick_diamond
+/datum/design/item/mining/pick_diamond
 	id = "pick_diamond"
 	req_tech = list(TECH_MATERIAL = 6)
 	materials = list(MAT_DIAMOND = 3000)
 	build_path = /obj/item/pickaxe/diamond
 	sort_string = "FAAAE"
 
-/datum/design/item/weapon/mining/drill_diamond
+/datum/design/item/mining/drill_diamond
 	id = "drill_diamond"
 	req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4)
 	materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000)
@@ -48,7 +48,7 @@
 
 // Mining other equipment
 
-/datum/design/item/weapon/mining/depth_scanner
+/datum/design/item/mining/depth_scanner
 	desc = "Used to check spatial depth and density of rock outcroppings."
 	id = "depth_scanner"
 	req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2)
@@ -56,11 +56,11 @@
 	build_path = /obj/item/depth_scanner
 	sort_string = "FBAAA"
 
-/datum/design/item/weapon/mining/upgradeAOE
+/datum/design/item/mining/upgradeAOE
 	name = "Mining Explosion Upgrade"
 	desc = "An area of effect upgrade for the Proto-Kinetic Accelerator."
 	id = "pka_mineaoe"
 	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 8, TECH_ENGINEERING = 7) // Lets make this endgame level tech, due to it's power.
 	materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 500, MAT_GOLD = 500, MAT_URANIUM = 2000, MAT_PHORON = 2000)
 	build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
-	sort_string = "FAAF"
+	sort_string = "FAAF"

code/modules/research/designs/misc_vr.dm

@@ -62,7 +62,7 @@
 	build_path = /obj/item/inducer/unloaded
 	sort_string = "TCVAB"
 
-/datum/design/item/weapon/mining/mining_scanner
+/datum/design/item/mining/mining_scanner
 	id = "mining_scanner"
 	req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1)
 	materials = list(MAT_STEEL = 1000,MAT_GLASS = 500)

code/modules/research/designs/weapons.dm

@@ -1,12 +1,12 @@
-/datum/design/item/weapon/AssembleDesignName()
+/datum/design/item/AssembleDesignName()
 	..()
 	name = "Weapon prototype ([item_name])"
 
-/datum/design/item/weapon/ammo/AssembleDesignName()
+/datum/design/item/ammo/AssembleDesignName()
 	..()
 	name = "Weapon ammo prototype ([item_name])"
 
-/datum/design/item/weapon/AssembleDesignDesc()
+/datum/design/item/AssembleDesignDesc()
 	if(!desc)
 		if(build_path)
 			var/obj/item/I = build_path
@@ -15,32 +15,32 @@
 
 // Energy weapons
 
-/datum/design/item/weapon/energy/AssembleDesignName()
+/datum/design/item/energy/AssembleDesignName()
 	..()
 	name = "Energy weapon prototype ([item_name])"
 
-/datum/design/item/weapon/energy/stunrevolver
+/datum/design/item/energy/stunrevolver
 	id = "stunrevolver"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
 	materials = list(MAT_STEEL = 4000)
 	build_path = /obj/item/gun/energy/stunrevolver
 	sort_string = "MAAAA"
 
-/datum/design/item/weapon/energy/nuclear_gun
+/datum/design/item/energy/nuclear_gun
 	id = "nuclear_gun"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
 	materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500)
 	build_path = /obj/item/gun/energy/gun/nuclear
 	sort_string = "MAAAB"
 
-/datum/design/item/weapon/energy/phoronpistol
+/datum/design/item/energy/phoronpistol
 	id = "ppistol"
 	req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
 	materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_PHORON = 3000)
 	build_path = /obj/item/gun/energy/toxgun
 	sort_string = "MAAAC"
 
-/datum/design/item/weapon/energy/lasercannon
+/datum/design/item/energy/lasercannon
 	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
 	id = "lasercannon"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
@@ -48,14 +48,14 @@
 	build_path = /obj/item/gun/energy/lasercannon
 	sort_string = "MAAAD"
 
-/datum/design/item/weapon/energy/decloner
+/datum/design/item/energy/decloner
 	id = "decloner"
 	req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
 	materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000)
 	build_path = /obj/item/gun/energy/decloner
 	sort_string = "MAAAE"
 
-/datum/design/item/weapon/energy/temp_gun
+/datum/design/item/energy/temp_gun
 	desc = "A gun that shoots high-powered glass-encased energy temperature bullets."
 	id = "temp_gun"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2)
@@ -63,14 +63,14 @@
 	build_path = /obj/item/gun/energy/temperature
 	sort_string = "MAAAF"
 
-/datum/design/item/weapon/energy/flora_gun
+/datum/design/item/energy/flora_gun
 	id = "flora_gun"
 	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
 	materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 500)
 	build_path = /obj/item/gun/energy/floragun
 	sort_string = "MAAAG"
 
-/datum/design/item/weapon/energy/vinstunrevolver
+/datum/design/item/energy/vinstunrevolver
 	id = "vinstunrevolver"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
 	materials = list(MAT_STEEL = 4000)
@@ -79,11 +79,11 @@
 
 // Ballistic weapons
 
-/datum/design/item/weapon/ballistic/AssembleDesignName()
+/datum/design/item/ballistic/AssembleDesignName()
 	..()
 	name = "Ballistic weapon prototype ([item_name])"
 
-/datum/design/item/weapon/ballistic/advanced_smg
+/datum/design/item/ballistic/advanced_smg
 	id = "smg"
 	desc = "An advanced 9mm SMG with a reflective laser optic."
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
@@ -93,11 +93,11 @@
 
 // Ballistic ammo
 
-/datum/design/item/weapon/ballistic/ammo/AssembleDesignName()
+/datum/design/item/ballistic/ammo/AssembleDesignName()
 	..()
 	name = "Ballistic weapon ammo prototype ([name])"
 
-/datum/design/item/weapon/ballistic/ammo/ammo_9mmAdvanced
+/datum/design/item/ballistic/ammo/ammo_9mmAdvanced
 	name = "9mm magazine"
 	id = "ammo_9mm"
 	desc = "A 21 round magazine for an advanced 9mm SMG."
@@ -106,7 +106,7 @@
 	build_path = /obj/item/ammo_magazine/m9mmAdvanced
 	sort_string = "MABBA"
 
-/datum/design/item/weapon/ballistic/ammo/stunshell
+/datum/design/item/ballistic/ammo/stunshell
 	name = "stun shells"
 	desc = "A stunning shell for a shotgun."
 	id = "stunshell"
@@ -115,7 +115,7 @@
 	build_path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell
 	sort_string = "MABBB"
 
-/datum/design/item/weapon/ballistic/ammo/empshell
+/datum/design/item/ballistic/ammo/empshell
 	name = "emp shells"
 	desc = "An electromagnetic shell for a shotgun."
 	id = "empshell"
@@ -126,33 +126,33 @@
 
 // Phase weapons
 
-/datum/design/item/weapon/phase/AssembleDesignName()
+/datum/design/item/phase/AssembleDesignName()
 	..()
 	name = "Phase weapon prototype ([item_name])"
 
 /* //VOREStation Removal Start
-/datum/design/item/weapon/phase/phase_pistol
+/datum/design/item/phase/phase_pistol
 	id = "phasepistol"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2)
 	materials = list(MAT_STEEL = 4000)
 	build_path = /obj/item/gun/energy/phasegun/pistol
 	sort_string = "MACAA"
 
-/datum/design/item/weapon/phase/phase_carbine
+/datum/design/item/phase/phase_carbine
 	id = "phasecarbine"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2)
 	materials = list(MAT_STEEL = 6000, MAT_GLASS = 1500)
 	build_path = /obj/item/gun/energy/phasegun
 	sort_string = "MACAB"
 
-/datum/design/item/weapon/phase/phase_rifle
+/datum/design/item/phase/phase_rifle
 	id = "phaserifle"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
 	materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_SILVER = 500)
 	build_path = /obj/item/gun/energy/phasegun/rifle
 	sort_string = "MACAC"
 
-/datum/design/item/weapon/phase/phase_cannon
+/datum/design/item/phase/phase_cannon
 	id = "phasecannon"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4)
 	materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_SILVER = 1000, MAT_DIAMOND = 750)
@@ -162,14 +162,14 @@
 
 // Other weapons
 
-/datum/design/item/weapon/rapidsyringe
+/datum/design/item/rapidsyringe
 	id = "rapidsyringe"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
 	materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000)
 	build_path = /obj/item/gun/launcher/syringe/rapid
 	sort_string = "MADAA"
 
-/datum/design/item/weapon/dartgun
+/datum/design/item/dartgun
 	desc = "A gun that fires small hollow chemical-payload darts."
 	id = "dartgun_r"
 	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1)
@@ -177,7 +177,7 @@
 	build_path = /obj/item/gun/projectile/dartgun/research
 	sort_string = "MADAB"
 
-/datum/design/item/weapon/chemsprayer
+/datum/design/item/chemsprayer
 	desc = "An advanced chem spraying device."
 	id = "chemsprayer"
 	req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
@@ -185,7 +185,7 @@
 	build_path = /obj/item/reagent_containers/spray/chemsprayer
 	sort_string = "MADAC"
 
-/datum/design/item/weapon/fuelrod
+/datum/design/item/fuelrod
 	id = "fuelrod_gun"
 	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5)
 	materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_URANIUM = 1000, MAT_PHORON = 3000, MAT_DIAMOND = 1000)
@@ -194,35 +194,35 @@
 
 // Ammo for those
 
-/datum/design/item/weapon/ammo/dartgunmag_small
+/datum/design/item/ammo/dartgunmag_small
 	id = "dartgun_mag_s"
 	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
 	materials = list(MAT_STEEL = 300, MAT_GOLD = 100, MAT_SILVER = 100, MAT_GLASS = 300)
 	build_path = /obj/item/ammo_magazine/chemdart/small
 	sort_string = "MADBA"
 
-/datum/design/item/weapon/ammo/dartgun_ammo_small
+/datum/design/item/ammo/dartgun_ammo_small
 	id = "dartgun_ammo_s"
 	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
 	materials = list(MAT_STEEL = 50, MAT_GOLD = 30, MAT_SILVER = 30, MAT_GLASS = 50)
 	build_path = /obj/item/ammo_casing/chemdart/small
 	sort_string = "MADBB"
 
-/datum/design/item/weapon/ammo/dartgunmag_med
+/datum/design/item/ammo/dartgunmag_med
 	id = "dartgun_mag_m"
 	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
 	materials = list(MAT_STEEL = 500, MAT_GOLD = 150, MAT_SILVER = 150, MAT_DIAMOND = 200, MAT_GLASS = 400)
 	build_path = /obj/item/ammo_magazine/chemdart
 	sort_string = "MADBC"
 
-/datum/design/item/weapon/ammo/dartgun_ammo_med
+/datum/design/item/ammo/dartgun_ammo_med
 	id = "dartgun_ammo_m"
 	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
 	materials = list(MAT_STEEL = 80, MAT_GOLD = 40, MAT_SILVER = 40, MAT_GLASS = 60)
 	build_path = /obj/item/ammo_casing/chemdart
 	sort_string = "MADBD"
 
-/datum/design/item/weapon/ammo/flechette
+/datum/design/item/ammo/flechette
 	id = "magnetic_ammo"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4)
 	materials = list(MAT_STEEL = 500, MAT_GOLD = 300, MAT_GLASS = 150, MAT_PHORON = 100)
@@ -231,11 +231,11 @@
 
 // Melee weapons
 
-/datum/design/item/weapon/melee/AssembleDesignName()
+/datum/design/item/melee/AssembleDesignName()
 	..()
 	name = "Melee weapon prototype ([item_name])"
 
-/datum/design/item/weapon/melee/esword
+/datum/design/item/melee/esword
 	name = "Portable Energy Blade"
 	id = "chargesword"
 	req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1)
@@ -243,7 +243,7 @@
 	build_path = /obj/item/melee/energy/sword/charge
 	sort_string = "MBAAA"
 
-/datum/design/item/weapon/melee/eaxe
+/datum/design/item/melee/eaxe
 	name = "Energy Axe"
 	id = "chargeaxe"
 	req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4)
@@ -252,11 +252,11 @@
 	sort_string = "MBAAB"
 
 // Grenade stuff
-/datum/design/item/weapon/grenade/AssembleDesignName()
+/datum/design/item/grenade/AssembleDesignName()
 	..()
 	name = "Grenade casing prototype ([item_name])"
 
-/datum/design/item/weapon/grenade/large_grenade
+/datum/design/item/grenade/large_grenade
 	id = "large_Grenade"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
 	materials = list(MAT_STEEL = 3000)

code/modules/research/designs/weapons_vr.dm

@@ -9,7 +9,7 @@
 
 // Energy Weapons
 
-/datum/design/item/weapon/energy/protector
+/datum/design/item/energy/protector
 	desc = "The 'Protector' is an advanced energy gun that cannot be fired in lethal mode on low security alert levels, but features DNA locking and a powerful stun."
 	id = "protector"
 	req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2)
@@ -17,7 +17,7 @@
 	build_path = /obj/item/gun/energy/gun/protector
 	sort_string = "MAAVA"
 
-/datum/design/item/weapon/energy/sickshot
+/datum/design/item/energy/sickshot
 	desc = "A 'Sickshot' is a 4-shot energy revolver that causes nausea and confusion."
 	id = "sickshot"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2)
@@ -25,7 +25,7 @@
 	build_path = /obj/item/gun/energy/sickshot
 	sort_string = "MAAVB"
 
-/datum/design/item/weapon/energy/netgun
+/datum/design/item/energy/netgun
 	desc  = "The \"Varmint Catcher\" is an energy net projector designed to immobilize dangerous wildlife."
 	id = "netgun"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3)
@@ -35,7 +35,7 @@
 
 // Misc weapons
 
-/datum/design/item/weapon/pummeler
+/datum/design/item/pummeler
 	desc = "With the 'Pummeler', punt anyone you don't like out of the room!"
 	id = "pummeler"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 5)
@@ -45,11 +45,11 @@
 
 // Anti-particle stuff
 
-/datum/design/item/weapon/particle/AssembleDesignName()
+/datum/design/item/particle/AssembleDesignName()
 	..()
 	name = "Anti-particle weapon prototype ([item_name])"
 
-/datum/design/item/weapon/particle/advparticle
+/datum/design/item/particle/advparticle
 	name = "Advanced anti-particle rifle"
 	id = "advparticle"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 5, TECH_POWER = 3, TECH_MAGNET = 3)
@@ -57,7 +57,7 @@
 	build_path = /obj/item/gun/energy/particle/advanced
 	sort_string = "MAAUA"
 
-/datum/design/item/weapon/particle/particlecannon
+/datum/design/item/particle/particlecannon
 	name = "Anti-particle cannon"
 	id = "particlecannon"
 	req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4)
@@ -65,7 +65,7 @@
 	build_path = /obj/item/gun/energy/particle/cannon
 	sort_string = "MAAUB"
 
-/datum/design/item/weapon/particle/pressureinterlock
+/datum/design/item/particle/pressureinterlock
 	name = "APP pressure interlock"
 	id = "pressureinterlock"
 	req_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
@@ -74,11 +74,11 @@
 	sort_string = "MAAUC"
 
 // NSFW gun and cells
-/datum/design/item/weapon/cell_based/AssembleDesignName()
+/datum/design/item/cell_based/AssembleDesignName()
 	..()
 	name = "Cell-based weapon prototype ([item_name])"
 
-/datum/design/item/weapon/cell_based/prototype_nsfw
+/datum/design/item/cell_based/prototype_nsfw
 	name = "cell-loaded revolver"
 	id = "nsfw_prototype"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7)
@@ -86,7 +86,7 @@
 	build_path = /obj/item/gun/projectile/cell_loaded/combat/prototype
 	sort_string = "MAVAA"
 
-/datum/design/item/weapon/cell_based/prototype_nsfw_mag
+/datum/design/item/cell_based/prototype_nsfw_mag
 	name = "combat cell magazine"
 	id = "nsfw_mag_prototype"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7)
@@ -154,7 +154,7 @@
 	build_path = /obj/item/ammo_casing/microbattery/combat/stripper
 	sort_string = "MAVCG"
 
-/datum/design/item/weapon/ballistic/ammo/ptrshell
+/datum/design/item/ballistic/ammo/ptrshell
 	name = "14.5mm shell"
 	desc = "A dense-core projectile fired from a small cannon."
 	id = "ptrshell"

code/modules/research/designs/xenoarch_toys.dm

@@ -1,10 +1,10 @@
-/datum/design/item/weapon/xenoarch/AssembleDesignName()
+/datum/design/item/xenoarch/AssembleDesignName()
 	..()
 	name = "Xenoarcheology equipment design ([item_name])"
 
 // Xenoarch tools
 
-/datum/design/item/weapon/xenoarch/ano_scanner
+/datum/design/item/xenoarch/ano_scanner
 	name = "Alden-Saraspova counter"
 	id = "ano_scanner"
 	desc = "Aids in triangulation of exotic particles."
@@ -13,7 +13,7 @@
 	build_path = /obj/item/ano_scanner
 	sort_string = "GAAAA"
 
-/datum/design/item/weapon/xenoarch/xenoarch_multi_tool
+/datum/design/item/xenoarch/xenoarch_multi_tool
 	name = "xenoarcheology multitool"
 	id = "xenoarch_multitool"
 	req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3)
@@ -21,11 +21,11 @@
 	materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_URANIUM = 500, MAT_PHORON = 500)
 	sort_string = "GAAAB"
 
-/datum/design/item/weapon/xenoarch/excavationdrill
+/datum/design/item/xenoarch/excavationdrill
 	name = "Excavation Drill"
 	id = "excavationdrill"
 	req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3)
 	build_type = PROTOLATHE
 	materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000)
 	build_path = /obj/item/pickaxe/excavationdrill
-	sort_string = "GAAAC"
+	sort_string = "GAAAC"

code/modules/research/designs/xenobio_toys.dm

@@ -1,17 +1,17 @@
-/datum/design/item/weapon/xenobio/AssembleDesignName()
+/datum/design/item/xenobio/AssembleDesignName()
 	..()
 	name = "Xenobiology equipment design ([item_name])"
 
 // Xenobio Weapons
 
-/datum/design/item/weapon/xenobio/slimebaton
+/datum/design/item/xenobio/slimebaton
 	id = "slimebaton"
 	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_POWER = 3, TECH_COMBAT = 3)
 	materials = list(MAT_STEEL = 5000)
 	build_path = /obj/item/melee/baton/slime
 	sort_string = "HAAAA"
 
-/datum/design/item/weapon/xenobio/slimetaser
+/datum/design/item/xenobio/slimetaser
 	id = "slimetaser"
 	req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4)
 	materials = list(MAT_STEEL = 5000)
@@ -20,11 +20,11 @@
 
 // Other
 
-/datum/design/item/weapon/xenobio/slime_scanner
+/datum/design/item/xenobio/slime_scanner
 	name = "slime scanner"
 	desc = "A hand-held body scanner able to learn information about slimes."
 	id = "slime_scanner"
 	req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
 	materials = list(MAT_STEEL = 500, MAT_GLASS = 500)
 	build_path = /obj/item/slime_scanner
-	sort_string = "HBAAA"
+	sort_string = "HBAAA"

code/modules/research/designs/xenobio_toys_vr.dm

@@ -1,4 +1,4 @@
-/datum/design/item/weapon/xenobio/monkey_gun
+/datum/design/item/xenobio/monkey_gun
 	name = "bluespace monkey deployment system"
 	desc = "An Advanced monkey teleportation and rehydration system. For serious monkey business."
 	id = "monkey_gun"
@@ -7,11 +7,11 @@
 	build_path = /obj/item/xenobio/monkey_gun
 	sort_string = "HBBA"
 
-/datum/design/item/weapon/xenobio/grinder
+/datum/design/item/xenobio/grinder
 	name = "portable slime processor"
 	desc = "This high tech device combines the slime processor with the latest in woodcutting technology."
 	id = "slime_grinder"
 	req_tech = list(TECH_MAGNET = 4, TECH_BIO = 7)
 	materials = list(MAT_STEEL = 500, MAT_GLASS = 500, MAT_DIAMOND = 500, MAT_MORPHIUM = 100)
 	build_path = /obj/item/slime_grinder
-	sort_string = "HBBB"
+	sort_string = "HBBB"

config/example/custom_items.txt

@@ -10,7 +10,7 @@
 # character_name: Jane Doe
 # item_path: /obj/item/toy/plushie
 # item_name: ugly plush toy
-# item_icon: flagmask     
+# item_icon: flagmask
 # item_desc: It's truly hideous.
 # req_titles: Assistant, Security Officer
 # req_access: 1
@@ -19,7 +19,7 @@
 # {
 # ckey: zuhayr
 # character_name: Jane Doe
-# item_path: /obj/item/device/kit/paint
+# item_path: /obj/item/kit/paint
 # item_name: APLU customisation kit
 # item_desc: A customisation kit with all the parts needed to turn an APLU into a "Titan's Fist" model.
 # kit_name: APLU "Titan's Fist"
@@ -31,7 +31,7 @@
 # {
 # ckey: zuhayr
 # character_name: Jane Doe
-# item_path: /obj/item/device/kit/suit
+# item_path: /obj/item/kit/suit
 # item_name: salvage suit customisation kit
 # item_desc: A customisation kit with all the parts needed to convert a suit.
 # kit_name: salvage

guides/Guide to Map Folders.md

@@ -44,7 +44,7 @@ mappath = 'tether_plains.dmm'
 # Non-map specific expedition areas should be loaded as follows:
 
 /// Away Missions
-#if AWAY_MISSION_TEST
+#ifdef AWAY_MISSION_TEST
 #include "../../expedition_vr/beach/beach.dmm"
 #include "../../expedition_vr/beach/cave.dmm"
 #include "../../expedition_vr/alienship/alienship.dmm"
@@ -65,4 +65,4 @@ mappath = 'tether_plains.dmm'
 /datum/map_z_level/tether_lateload/away_beach
 	name = "Away Mission - Desert Beach"
 	z = Z_LEVEL_BEACH
-	base_turf = /turf/simulated/floor/outdoors/rocks/caves
+	base_turf = /turf/simulated/floor/outdoors/rocks/caves

maps/_templates_and_guidance/Mapping Templates Readme.md

@@ -10,16 +10,8 @@ The following folders will be listed here. If there’s been an update and this
 * Mapping Guides
     * This folder exists for newer contributors to physically pull examples from, for example; SMES Wiring.dmm would be for guidance on how to properly wire an SMES. This is not an exhaustive list, but should help the repeated/FAQ questions by allowing one to poke at it in a map editor.
 * Public Event Templates
-<<<<<<< HEAD
-    * This folder exists to house templates available to the public. Bear in mind that Game Master staff will likely not house all event templates publicly for security + future events, but this should be updated once a map is done with or a GM leaves the team and wishes to leave their maps public for future use.
-* Public Ship Templates
-    * This folder exists for SHIP templates that do not normally go into the ships folder (For reference, this ship folder is maps/offmap_vr/om_ships, or overmap/ships). This is for example ships, or for EM-specific, public ships.
-* Templates
-    * This folder is specifically for pre-prepared, ready-to-place templates for things such as drop pods, small maps, etc, things GM-staff will use regularly that are not necessarily related to events.
-=======
     * This folder exists to house templates available to the public. Bear in mind that Event Manager staff will likely not house all event templates publicly for security + future events, but this should be updated once a map is done with or an EM leaves the team and wishes to leave their maps public for future use.
 * Public Ship Templates
     * This folder exists for SHIP templates that do not normally go into the ships folder (For reference, this ship folder is maps/offmap_vr/om_ships, or overmap/ships). This is for example ships, or for EM-specific, public ships.
 * Templates
     * This folder is specifically for pre-prepared, ready-to-place templates for things such as drop pods, small maps, etc, things EM-staff will use regularly that are not necessarily related to events.
->>>>>>> 152acacf893... Merge pull request #8555 from Rykka-Stormheart/shep-dev-map-templates

maps/cynosure/cynosure-2.dmm

@@ -854,17 +854,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/surface/station/hallway/secondary/groundfloor/civilian)
 "azs" = (
-<<<<<<< HEAD
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/brflowers,
-/turf/simulated/floor/grass,
-=======
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -30
 	},
 /turf/simulated/floor/fakesnow,
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /area/surface/station/park)
 "aBf" = (
 /obj/effect/floor_decal/spline/plain{
@@ -5708,13 +5701,6 @@
 /obj/effect/floor_decal/spline/plain{
 	icon_state = "spline_plain_full"
 	},
-<<<<<<< HEAD
-/obj/item/bikehorn/rubberducky{
-	pixel_x = 6;
-	pixel_y = -6
-	},
-=======
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /obj/machinery/camera/network/ground_floor{
 	c_tag = "Ground Floor - Park Center";
 	dir = 1;
@@ -13417,17 +13403,12 @@
 /area/surface/station/rnd/research_lockerroom)
 "gvo" = (
 /obj/structure/table/woodentable,
-<<<<<<< HEAD
-/obj/item/dice/d20,
-/obj/item/deck/cards,
-=======
 /obj/item/dice/d20,
 /obj/item/deck/cards,
 /obj/structure/flora/pottedplant/xmas{
 	pixel_x = 16;
 	pixel_y = 25
 	},
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/carpet,
 /area/surface/station/library)
 "gvD" = (
@@ -16658,8 +16639,6 @@
 	},
 /turf/simulated/floor/tiled/old_tile/gray,
 /area/surface/station/medical/surgery_storage)
-<<<<<<< HEAD
-=======
 "ibT" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -16677,7 +16656,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/surface/station/park)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "icz" = (
 /obj/structure/table/reinforced,
 /obj/machinery/firealarm{
@@ -16872,8 +16850,6 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner{
 	dir = 1
 	},
-<<<<<<< HEAD
-=======
 /obj/structure/extinguisher_cabinet{
 	dir = 1;
 	pixel_y = 30
@@ -16882,7 +16858,6 @@
 	dir = 1;
 	pixel_y = 32
 	},
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/tiled,
 /area/surface/station/hallway/primary/groundfloor/north)
 "ihg" = (
@@ -18067,20 +18042,12 @@
 	},
 /turf/simulated/floor/plating/sif/planetuse,
 /area/surface/outside/station/solar/westsolar)
-<<<<<<< HEAD
-"iOa" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/fullgrass,
-/turf/simulated/floor/grass,
-/area/surface/station/park)
-=======
 "iOD" = (
 /obj/structure/sign/level/ground/large{
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
 /area/surface/station/hallway/primary/groundfloor/east)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "iPo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -22267,12 +22234,8 @@
 /area/surface/station/medical/etc)
 "kKR" = (
 /obj/structure/table/woodentable,
-<<<<<<< HEAD
-/obj/item/deck/cards,
-=======
 /obj/item/deck/cards,
 /obj/item/toy/xmas_cracker,
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/wood,
 /area/surface/station/crew_quarters/cafeteria)
 "kKX" = (
@@ -24203,8 +24166,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/surface/station/security/lobby)
-<<<<<<< HEAD
-=======
 "lIt" = (
 /obj/random/vendorfood,
 /obj/structure/sign/christmas/lights{
@@ -24213,7 +24174,6 @@
 	},
 /turf/simulated/floor/tiled/hydro,
 /area/surface/station/park)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "lIJ" = (
 /obj/machinery/computer/aifixer{
 	dir = 8
@@ -27287,8 +27247,6 @@
 /obj/item/folder/red,
 /turf/simulated/floor/plating,
 /area/surface/station/security/briefing_room)
-<<<<<<< HEAD
-=======
 "mWA" = (
 /turf/simulated/wall/r_concrete,
 /area/surface/station/maintenance/kitchen)
@@ -27300,7 +27258,6 @@
 	},
 /turf/simulated/floor/tiled/hydro,
 /area/surface/station/park)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "mXo" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -27409,15 +27366,11 @@
 /obj/effect/floor_decal/corner/blue/bordercorner2{
 	dir = 10
 	},
-<<<<<<< HEAD
-/obj/item/banner/nt,
-=======
 /obj/item/banner/nt,
 /obj/structure/sign/christmas/lights{
 	dir = 8;
 	pixel_x = -32
 	},
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/tiled/techmaint,
 /area/surface/station/hallway/primary/groundfloor/south)
 "naO" = (
@@ -30252,8 +30205,6 @@
 	c_tag = "Ground Floor - South Hallway 3";
 	dir = 8
 	},
-<<<<<<< HEAD
-=======
 /obj/structure/sign/directions/bar{
 	dir = 5;
 	pixel_y = 39
@@ -30263,7 +30214,6 @@
 	pixel_y = 32
 	},
 /obj/structure/flora/pottedplant/xmas,
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/tiled/techmaint,
 /area/surface/station/hallway/primary/groundfloor/south)
 "osf" = (
@@ -49858,17 +49808,12 @@
 	},
 /obj/item/roller,
 /obj/item/bodybag/cryobag,
-<<<<<<< HEAD
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/pill_bottle/spaceacillin,
-=======
 /obj/item/storage/firstaid/regular,
 /obj/item/storage/pill_bottle/spaceacillin,
 /obj/structure/sign/christmas/lights{
 	dir = 4;
 	pixel_x = 32
 	},
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/wood,
 /area/surface/station/crew_quarters/cafeteria)
 "xGi" = (
@@ -66847,23 +66792,6 @@ vwy
 vwy
 vwy
 vwy
-<<<<<<< HEAD
-aNW
-aNW
-aNW
-aNW
-oum
-oum
-oum
-oum
-oum
-oum
-oum
-aNW
-aNW
-aNW
-aNW
-=======
 vSk
 vSk
 vSk
@@ -66879,7 +66807,6 @@ vSk
 vSk
 vSk
 vSk
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 vwy
 vwy
 vwy
@@ -66892,23 +66819,6 @@ iGM
 iGM
 iGM
 iGM
-<<<<<<< HEAD
-aNW
-dXk
-qzz
-qzz
-qzz
-qzz
-qzz
-qzz
-qzz
-dXk
-qzz
-qzz
-qzz
-qzz
-qzz
-=======
 vSk
 jWt
 jWt
@@ -66924,7 +66834,6 @@ jWt
 jWt
 jWt
 jWt
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 wYa
 "}
 (61,1,1) = {"
@@ -66959,15 +66868,9 @@ vwy
 vwy
 vwy
 vwy
-<<<<<<< HEAD
-vwy
-vwy
-vwy
-=======
 fyc
 fyc
 fyc
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 vwy
 vwy
 vwy
@@ -81734,21 +81637,12 @@ lUL
 jmQ
 lUL
 lUL
-<<<<<<< HEAD
-oqM
-sYq
-oqM
-sYq
-pts
-bql
-=======
 xUE
 ogV
 xUE
 ogV
 ibT
 tsW
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 wAe
 rIC
 tDF

maps/cynosure/cynosure-3.dmm

@@ -2233,12 +2233,7 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 5
 	},
-<<<<<<< HEAD
-/obj/structure/flora/pottedplant/drooping,
 /obj/item/radio/intercom{
-=======
-/obj/item/radio/intercom{
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 	dir = 4;
 	pixel_x = 21
 	},
@@ -6081,8 +6076,6 @@
 	dir = 8;
 	pixel_y = 32
 	},
-<<<<<<< HEAD
-=======
 /obj/structure/sign/levels/security{
 	dir = 5;
 	pixel_y = 26
@@ -6091,7 +6084,6 @@
 	dir = 1;
 	pixel_y = 32
 	},
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 /turf/simulated/floor/tiled,
 /area/surface/station/hallway/secondary/secondfloor/civilian)
 "ehU" = (
@@ -23169,16 +23161,9 @@
 	pixel_x = -32;
 	pixel_y = -6
 	},
-<<<<<<< HEAD
-/obj/structure/sign/directions/stairs_down{
-	dir = 4;
-	pixel_x = -32;
-	pixel_y = -12
-=======
 /obj/structure/sign/christmas/lights{
 	dir = 8;
 	pixel_x = -32
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 	},
 /turf/simulated/floor/plating,
 /area/surface/station/hallway/primary/secondfloor/east)
@@ -67555,13 +67540,8 @@ uwO
 uwO
 uwO
 uwO
-<<<<<<< HEAD
-uDG
-iaD
-=======
 aPW
 rsz
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 iaD
 jIo
 ifR

maps/cynosure/cynosure-6.dmm

@@ -1194,8 +1194,6 @@
 /obj/machinery/optable,
 /turf/simulated/shuttle/floor/white,
 /area/skipjack_station/start)
-<<<<<<< HEAD
-=======
 "boh" = (
 /obj/structure/flora/pottedplant/stoutbush,
 /obj/structure/sign/christmas/lights{
@@ -1214,7 +1212,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape/centcom)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "bos" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 10

maps/cynosure/cynosure-7.dmm

@@ -18,8 +18,6 @@
 	},
 /turf/simulated/floor/outdoors/mask,
 /area/surface/outside/wilderness/mountains)
-<<<<<<< HEAD
-=======
 "dj" = (
 /obj/vehicle/boat/sifwood,
 /turf/simulated/floor/outdoors/mask,
@@ -30,7 +28,6 @@
 "eZ" = (
 /turf/simulated/wall/sifwood,
 /area/surface/wilderness/shack)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "fy" = (
 /obj/structure/cliff/automatic,
 /turf/simulated/floor/outdoors/mask,
@@ -193,19 +190,10 @@
 	},
 /turf/simulated/floor/outdoors/grass/sif,
 /area/surface/outside/wilderness/mountains)
-<<<<<<< HEAD
-"Cb" = (
-/obj/structure/cliff/automatic/corner{
-	dir = 6
-	},
-/turf/simulated/floor/outdoors/mask,
-/area/surface/outside/wilderness/normal)
-=======
 "CP" = (
 /obj/structure/table/bench/sifwooden,
 /turf/simulated/floor/outdoors/shelfice,
 /area/surface/outside/river/gautelfr)
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 "CR" = (
 /turf/simulated/floor/outdoors/dirt/sif,
 /area/surface/outside/wilderness/mountains)
@@ -2945,8 +2933,6 @@ oR
 oR
 oR
 oR
-<<<<<<< HEAD
-=======
 PH
 oR
 oR
@@ -3150,7 +3136,6 @@ pM
 oR
 oR
 oR
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 oR
 oR
 oR
@@ -13948,208 +13933,6 @@ oR
 oR
 oR
 oR
-<<<<<<< HEAD
-tM
-tM
-tM
-MS
-MS
-MS
-MS
-tM
-tM
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Aq
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-Ax
-VU
-GK
-bE
-"}
-(48,1,1) = {"
-jq
-pM
-pM
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-uP
-oR
-oR
-oR
-oR
-oR
-uP
-oR
-oR
-oR
-uP
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-oR
-=======
 dV
 dV
 dV
@@ -14159,7 +13942,6 @@ dV
 dV
 dV
 dV
->>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022
 oR
 oR
 oR

maps/cynosure/cynosure_shuttles.dm

@@ -442,7 +442,7 @@ ESCAPE_POD(1)
 
 /*
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "generic_shuttle.dmm"
 #endif
 
@@ -496,4 +496,4 @@ ESCAPE_POD(1)
     vessel_mass = 1000
     vessel_size = SHIP_SIZE_TINY
     shuttle = "Private Vessel"
-*/
+*/

maps/expedition_vr/beach/submaps/mountains.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "deadBeacon.dmm"
 #include "prepper1.dmm"
 #include "quarantineshuttle.dmm"
@@ -371,4 +371,3 @@
 	mappath = 'maps/expedition_vr/beach/submaps/speakeasy_vr.dmm'
 	cost = 10
 	allow_duplicates = FALSE
-

maps/groundbase/groundbase.dm

@@ -12,7 +12,7 @@
 	#include "..\offmap_vr\common_offmaps.dm"
 	#include "..\~map_system\maps_vr.dm"
 
-	#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
+	#ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
 		#include "gb-z1.dmm"
 		#include "gb-z2.dmm"
 		#include "gb-z3.dmm"
@@ -24,4 +24,4 @@
 
 	#warn A map has already been included, ignoring Groundbase
 
-#endif
+#endif

maps/groundbase/groundbase_poi_stuff.dm

@@ -1,4 +1,4 @@
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "pois/outdoors1.dmm"
 #include "pois/outdoors2.dmm"
 #include "pois/outdoors3.dmm"

maps/offmap_vr/common_offmaps.dm

@@ -1,5 +1,5 @@
 /// Away Missions
-#if AWAY_MISSION_TEST
+#ifdef AWAY_MISSION_TEST
 #include "../expedition_vr/beach/beach.dmm"
 #include "../expedition_vr/beach/cave.dmm"
 #include "../expedition_vr/alienship/alienship.dmm"
@@ -358,7 +358,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////
 // Admin-use z-levels for loading whenever an admin feels like
-#if AWAY_MISSION_TEST
+#ifdef AWAY_MISSION_TEST
 #include "../submaps/admin_use_vr/spa.dmm"
 #endif
 #include "../submaps/admin_use_vr/fun.dm"
@@ -616,7 +616,7 @@
 #include "../offmap_vr/talon/talon_v2.dm"
 #include "../offmap_vr/talon/talon_v2_areas.dm"
 
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "../offmap_vr/talon/talon_v2.dmm"
 #endif
 

maps/offmap_vr/om_ships/abductor.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "abductor.dmm"
 #endif
 
@@ -85,4 +85,3 @@ You will find a dispenser within the room you started in which contains some bas
 /obj/machinery/power/rtg/abductor/built/abductor
 	name = "Void Core"
 	power_gen = 5000000
-

maps/offmap_vr/om_ships/aro.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "aro.dmm"
 #endif
 

maps/offmap_vr/om_ships/aro2.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "aro2.dmm"
 #endif
 
@@ -100,4 +100,4 @@
 	docking_controller_tag = "aroboat2_docker"
 	shuttle_area = /area/shuttle/aroboat2
 	fuel_consumption = 0
-	defer_initialisation = TRUE
+	defer_initialisation = TRUE

maps/offmap_vr/om_ships/aro3.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "aro3.dmm"
 #endif
 

maps/offmap_vr/om_ships/bearcat.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "bearcat.dmm"
 #endif
 
@@ -199,4 +199,4 @@
 /area/shuttle/bearcat/comms
 	name = "\improper Bearcat Communications Relay"
 	icon_state = "tcomsatcham"
-	music = list('sound/ambience/signal.ogg')
+	music = list('sound/ambience/signal.ogg')

maps/offmap_vr/om_ships/curashuttle.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "curashuttle.dmm"
 #endif
 
@@ -63,4 +63,4 @@
 [b]Notice[/b]: Small private vessel"}
 	vessel_mass = 2000
 	vessel_size = SHIP_SIZE_TINY
-	shuttle = "Cura"
+	shuttle = "Cura"

maps/offmap_vr/om_ships/geckos.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "gecko_sh.dmm"
 #include "gecko_cr.dmm"
 #endif

maps/offmap_vr/om_ships/generic_shuttle.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "generic_shuttle.dmm"
 #endif
 
@@ -52,4 +52,4 @@
 [b]Notice[/b]: Small private vessel"}
 	vessel_mass = 1000
 	vessel_size = SHIP_SIZE_TINY
-	shuttle = "Private Vessel"
+	shuttle = "Private Vessel"

maps/offmap_vr/om_ships/hybridshuttle.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "hybridshuttle.dmm"
 #endif
 
@@ -49,4 +49,4 @@
 [b]Notice[/b]: Experimental vessel"}
 	vessel_mass = 3000
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "XN-29 Prototype Shuttle"
+	shuttle = "XN-29 Prototype Shuttle"

maps/offmap_vr/om_ships/itglight.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "itglight.dmm"
 #endif
 
@@ -149,4 +149,4 @@
 	She has six point defense turrets, but her armor is thin, and she hasn't got any fancy shields. <br>
 	She's not a combat ship, and she demands a competent pilot to treat her right.<br><br>
 	Also d1a2 is best port, just saying.<br><br>
-	Also the ship is 150 meters long and 92 meters wide, in case that is ever relevent."}
+	Also the ship is 150 meters long and 92 meters wide, in case that is ever relevent."}

maps/offmap_vr/om_ships/lunaship.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "lunaship.dmm"
 #endif
 
@@ -97,4 +97,4 @@
 	vessel_size = SHIP_SIZE_SMALL
 	initial_generic_waypoints = list("luna_near_fore_port", "luna_near_fore_star", "luna_near_aft_port", "luna_near_aft_star", "luna_near_fore", "luna_wing_port", "luna_wing_star", "luna_near_aft")
 	fore_dir = NORTH
-	known = FALSE
+	known = FALSE

maps/offmap_vr/om_ships/mackerels.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "mackerel_sh.dmm"
 #include "mackerel_lc.dmm"
 #include "mackerel_lc_wreck.dmm"

maps/offmap_vr/om_ships/mercenarybase.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "mercenarybase.dmm"
 #endif
 
@@ -44,4 +44,4 @@
 /area/mercbase/dock
 	name = "\improper Mercenary Base Boat Dock"
 /area/mercbase/cafeteria
-	name = "\improper Mercenary Base Boat Cafeteria"
+	name = "\improper Mercenary Base Boat Cafeteria"

maps/offmap_vr/om_ships/mercship.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "mercship.dmm"
 #endif
 
@@ -105,4 +105,4 @@
 	docking_controller_tag = "mercboat_docker"
 	shuttle_area = /area/shuttle/mercboat
 	fuel_consumption = 0
-	defer_initialisation = TRUE
+	defer_initialisation = TRUE

maps/offmap_vr/om_ships/salamander.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "salamander.dmm"
 #endif
 
@@ -207,4 +207,4 @@ stay safe out there and always double check who you sign with<br>\
 <br>\
 rest of the cargo is covered by insurance anyway, so help yourself/ves i guess<br>\
 <br>\
--M"}
+-M"}

maps/offmap_vr/om_ships/screebarge.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "screebarge.dmm"
 #endif
 
@@ -50,4 +50,4 @@
 	desc = "Some sort of makeshift battle barge. Appears to be armed."
 	vessel_mass = 3000
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "Battle Barge"
+	shuttle = "Battle Barge"

maps/offmap_vr/om_ships/sdf_corvettes.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "sdf_corvette.dmm"
 #include "sdf_corvette_wreck.dmm"
 #include "sdf_cutter.dmm"

maps/offmap_vr/om_ships/shelter_5.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "shelter_5.dmm"
 #endif
 

maps/offmap_vr/om_ships/vespa.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "vespa.dmm"
 #endif
 
@@ -159,4 +159,4 @@
     //docking_controller_tag = "vespaboat_docker"
     //shuttle_area = /area/shuttle/vespaboat
     //fuel_consumption = 0
-    //defer_initialisation = TRUE
+    //defer_initialisation = TRUE

maps/om_adventure/grasscave.dm

@@ -1,4 +1,4 @@
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "pois/darkstar.dmm"
 #include "pois/darktear1.dmm"
 #include "pois/darktear2.dmm"

maps/redgate/laserdome.dmm

@@ -163,12 +163,12 @@
 /area/redgate/laserdome/arena/capture_the_flag)
 "bRk" = (
 /obj/structure/table/marble,
-/obj/item/device/encryptionkey/ent,
-/obj/item/device/encryptionkey/ent,
-/obj/item/device/encryptionkey/ent,
-/obj/item/device/encryptionkey/ent,
-/obj/item/device/encryptionkey/ent,
-/obj/item/device/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
 /turf/simulated/floor/tiled/milspec,
 /area/redgate/laserdome/lobby)
 "bVo" = (
@@ -345,12 +345,12 @@
 /area/redgate/laserdome/lobby/spaceview_lounge)
 "dLr" = (
 /obj/structure/table/marble,
-/obj/item/weapon/reagent_containers/food/snacks/chickenfillet,
-/obj/item/weapon/reagent_containers/food/snacks/chickenfillet,
-/obj/item/weapon/reagent_containers/food/snacks/chickenfillet,
-/obj/item/weapon/reagent_containers/food/snacks/chickenfillet,
-/obj/item/weapon/reagent_containers/food/snacks/chickenfillet,
-/obj/item/weapon/reagent_containers/food/snacks/chickenfillet,
+/obj/item/reagent_containers/food/snacks/chickenfillet,
+/obj/item/reagent_containers/food/snacks/chickenfillet,
+/obj/item/reagent_containers/food/snacks/chickenfillet,
+/obj/item/reagent_containers/food/snacks/chickenfillet,
+/obj/item/reagent_containers/food/snacks/chickenfillet,
+/obj/item/reagent_containers/food/snacks/chickenfillet,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/redgate/laserdome/lobby/restaurant)
 "dPZ" = (
@@ -536,8 +536,8 @@
 /area/redgate/laserdome/arena/hyperball)
 "fAL" = (
 /obj/structure/table/marble,
-/obj/item/device/encryptionkey/ent,
-/obj/item/device/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
+/obj/item/encryptionkey/ent,
 /turf/simulated/floor/tiled/milspec,
 /area/redgate/laserdome/lobby)
 "fCY" = (
@@ -1215,9 +1215,9 @@
 /area/redgate/laserdome/lobby/restaurant)
 "lpp" = (
 /obj/structure/table/marble,
-/obj/item/weapon/reagent_containers/food/snacks/fries,
-/obj/item/weapon/reagent_containers/food/snacks/fries,
-/obj/item/weapon/reagent_containers/food/snacks/fries,
+/obj/item/reagent_containers/food/snacks/fries,
+/obj/item/reagent_containers/food/snacks/fries,
+/obj/item/reagent_containers/food/snacks/fries,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/redgate/laserdome/lobby/restaurant)
 "lDM" = (
@@ -1327,7 +1327,7 @@
 /obj/random/pizzabox,
 /obj/random/pizzabox,
 /obj/random/pizzabox,
-/obj/item/weapon/material/knife/plastic,
+/obj/item/material/knife/plastic,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/redgate/laserdome/lobby/restaurant)
 "mBZ" = (
@@ -1653,7 +1653,7 @@
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/redgate/laserdome/lobby/aid_station)
 "poL" = (
-/obj/item/weapon/stool/baystool/padded{
+/obj/item/stool/baystool/padded{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/milspec,

maps/stellar_delight/stellar_delight.dm

@@ -11,7 +11,7 @@
 	#include "..\offmap_vr\common_offmaps.dm"
 	#include "..\tether\tether_jobs.dm"
 
-	#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
+	#ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
 		#include "stellar_delight1.dmm"
 		#include "stellar_delight2.dmm"
 		#include "stellar_delight3.dmm"
@@ -23,4 +23,4 @@
 
 	#warn A map has already been included, ignoring Tether
 
-#endif
+#endif

maps/submaps/admin_use_vr/ert.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "ert.dmm"
 #endif
 
@@ -24,7 +24,7 @@
 /area/ship/ert/engineering
 	name = "\improper NRV Von Braun - Engineering Control Room"
 	icon_state = "engine_monitoring"
-	
+
 /area/ship/ert/eng_storage
 	name = "\improper NRV Von Braun - Engineering Storage"
 	icon_state = "storage"
@@ -36,7 +36,7 @@
 /area/ship/ert/atmos
 	name = "\improper NRV Von Braun - Atmospherics"
 	icon_state = "atmos"
-                                   
+
 /area/ship/ert/mech_bay
 	name = "\improper NRV Von Braun - RIG & Mech Bay"
 	icon_state = "yellow"
@@ -184,7 +184,7 @@
 	on_enter_occupant_message = "You feel cool air surround you. You go numb as your senses turn inward."
 	on_store_visible_message_1 = "hums and hisses as it moves"
 	on_store_visible_message_2 = "into cryogenic storage."
-	
+
 //Misc Stuff
 /obj/item/paper/ert_armory_cells
 	name = "ERT Armory Cell Supply"
@@ -236,4 +236,4 @@ P.S. Before any of you ask, no, you cannot fire yourself or your teammates out o
 
 	storage_type = "responders"
 	storage_name = "ERT Oversight Control"
-	allow_items = 1
+	allow_items = 1

maps/submaps/admin_use_vr/event_autonomous_drone.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "event_autonomous_drone.dmm"
 #endif
 

maps/submaps/admin_use_vr/mercship.dm

@@ -1,5 +1,5 @@
 	// Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "mercship.dmm"
 #endif
 
@@ -32,7 +32,7 @@
 /area/ship/manta/atmos
 	name = "\improper Mercenary Cruiser - Atmospherics"
 	icon_state = "atmos"
-                                   
+
 /area/ship/manta/mech_bay
 	name = "\improper Mercenary Cruiser - Mech Bay"
 	icon_state = "mechbay"
@@ -100,19 +100,19 @@
 /area/ship/manta/commander
 	name = "\improper Mercenary Cruiser - Commander's Room"
 	icon_state = "head_quarters"
-	
+
 /area/ship/manta/holding
 	name = "\improper Mercenary Cruiser - Holding Cells"
 	icon_state = "brig"
-	
+
 /area/ship/manta/recreation
 	name = "\improper Mercenary Cruiser - Recreation & Supplies"
 	icon_state = "recreation_area"
-	
+
 /area/ship/manta/gunnery
 	name = "\improper Mercenary Cruiser - Gunnery"
 	icon_state = "security_sub"
-	
+
 /area/ship/manta/magazine
 	name = "\improper Mercenary Cruiser - Cannon Magazine"
 	icon_state = "darkred"
@@ -218,7 +218,7 @@
 	on_enter_occupant_message = "You feel cool air surround you. You go numb as your senses turn inward."
 	on_store_visible_message_1 = "hums and hisses as it moves"
 	on_store_visible_message_2 = "into cryogenic storage."
-	
+
 //Misc Stuff
 /obj/item/paper/manta_shields
 	name = "Shield Setup"
@@ -296,4 +296,4 @@ In the meantime, happy hunting. Go bag me some carp. The mech bay can be found i
 
 	storage_type = "mercenaries"
 	storage_name = "Merc Oversight Control"
-	allow_items = 1
+	allow_items = 1

maps/submaps/admin_use_vr/salamander_trader.dm

@@ -1,5 +1,5 @@
 // Compile in the map for CI testing if we're testing compileability of all the maps
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "salamander_trader.dmm"
 #endif
 
@@ -25,28 +25,28 @@
 	requires_power = 1
 	has_gravity = 0
 
-/area/shuttle/salamander_trader_q1	
+/area/shuttle/salamander_trader_q1
 	name = "\improper Salamander Trader Quarters 1"
 	icon = 'icons/turf/areas_vr_talon.dmi'
 	icon_state = "gray-p"
 	requires_power = 1
 	has_gravity = 0
 
-/area/shuttle/salamander_trader_q2	
+/area/shuttle/salamander_trader_q2
 	name = "\improper Salamander Trader Quarters 2"
 	icon = 'icons/turf/areas_vr_talon.dmi'
 	icon_state = "gray-s"
 	requires_power = 1
 	has_gravity = 0
 
-/area/shuttle/salamander_trader_galley	
+/area/shuttle/salamander_trader_galley
 	name = "\improper Salamander Trader Galley"
 	icon = 'icons/turf/areas_vr_talon.dmi'
 	icon_state = "dark-s"
 	requires_power = 1
 	has_gravity = 0
 
-/area/shuttle/salamander_trader_head	
+/area/shuttle/salamander_trader_head
 	name = "\improper Salamander Trader Head"
 	icon = 'icons/turf/areas_vr_talon.dmi'
 	icon_state = "dark-p"
@@ -87,4 +87,4 @@
 	vessel_mass = 4500
 	vessel_size = SHIP_SIZE_LARGE
 	fore_dir = EAST
-	shuttle = "Salamander Trader"
+	shuttle = "Salamander Trader"

maps/submaps/engine_submaps/southern_cross/_engine_submaps.dm

@@ -2,7 +2,7 @@
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new engine, please add it to this list.
 // Polaris: R-UST and Singulo are commented out as their current submap does not line up with the control room.
-#if MAP_TEST
+#ifdef MAP_TEST
 // #include "engine_rust.dmm"
 // #include "engine_singulo.dmm"
 #include "engine_sme.dmm"
@@ -33,4 +33,4 @@
 /datum/map_template/engine/tesla
 	name = "Edison's Bane"
 	desc = "The Telsa Engine"
-	mappath = 'maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm' 
+	mappath = 'maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm'

maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm

@@ -1,7 +1,7 @@
 // This causes engine maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new engine, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "engine_rust.dmm"
 #include "engine_singulo.dmm"
 #include "engine_sme.dmm"
@@ -32,4 +32,4 @@
 /datum/map_template/engine/tesla
 	name = "Edison's Bane"
 	desc = "The Telsa Engine"
-	mappath = 'maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm'
+	mappath = 'maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm'

maps/submaps/pois_vr/aerostat/virgo2.dm

@@ -1,6 +1,6 @@
 #include "virgo2_submap_areas.dm"
 
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "Flake.dmm"
 #include "MCamp1.dmm"
 #include "Rocky1.dmm"

maps/submaps/space_rocks/space_rocks_pois.dm

@@ -1,4 +1,4 @@
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "bittynest1.dmm"
 #include "bittynest2.dmm"
 #include "bittynest3.dmm"

maps/submaps/space_submaps/debrisfield/debrisfield.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 // #define "your_map_here.dmm"
 #endif
 
@@ -9,4 +9,4 @@
 	name = "Space Content - Debrisfield"
 	desc = "Designed for space points of interest."
 
-// No points of interest yet, but the infrastructure is there for people to add!
+// No points of interest yet, but the infrastructure is there for people to add!

maps/submaps/space_submaps/space.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 // #define "your_map_here.dmm"
 #endif
 
@@ -9,4 +9,4 @@
 	name = "POI - Space Content"
 	desc = "A map template base.  In space."
 
-// To be added: Templates for space exploration when they are made.
+// To be added: Templates for space exploration when they are made.

maps/submaps/surface_submaps/mountains/mountains.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "deadBeacon.dmm"
 #include "prepper1.dmm"
 #include "quarantineshuttle.dmm"
@@ -371,4 +371,3 @@
 	mappath = 'maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm'
 	cost = 10
 	allow_duplicates = FALSE
-

maps/submaps/surface_submaps/plains/plains.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "farm1.dmm"
 #include "construction1.dmm"
 #include "camp1.dmm"
@@ -338,7 +338,7 @@
 	name = "Syndi Sniper"
 	desc = "Syndicate watch tower, deadly but secluded"
 	mappath = 'maps/submaps/surface_submaps/plains/syndisniper.dmm'
-	
+
 	cost = 5
 
 /datum/map_template/surface/plains/drgnplateu
@@ -346,4 +346,4 @@
 	desc = "A dangerous plateu of cliffs home to a rampant gold hoarding dragon"
 	mappath = 'maps/submaps/surface_submaps/plains/drgnplateu.dmm'
 	cost = 15
-	allow_duplicates = FALSE
+	allow_duplicates = FALSE

maps/submaps/surface_submaps/plains/plains_vr.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "farm1.dmm"
 #include "construction1.dmm"
 #include "camp1.dmm"

maps/submaps/surface_submaps/wilderness/wilderness.dm

@@ -1,7 +1,7 @@
 // This causes PoI maps to get 'checked' and compiled, when undergoing a unit test.
 // This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors.
 // When adding a new PoI, please add it to this list.
-#if MAP_TEST
+#ifdef MAP_TEST
 #include "spider1.dmm"
 #include "Flake.dmm"
 #include "MCamp1.dmm"

maps/tether/tether.dm

@@ -12,7 +12,7 @@
 	#include "tether_events.dm"
 	#include "../offmap_vr/common_offmaps.dm"
 
-	#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
+	#ifndef AWAY_MISSION_TEST //Don't include these for just testing away missions
 		#include "tether-01-surface1.dmm"
 		#include "tether-02-surface2.dmm"
 		#include "tether-03-surface3.dmm"

maps/~map_system/_map_selection.dm

@@ -0,0 +1,38 @@
+#ifndef CITESTING
+
+/*********************/
+/* MAP SELECTION     */
+/* FOR LIVE SERVER   */
+/*********************/
+
+#define USE_MAP_TETHER
+//#define USE_MAP_STELLARDELIGHT
+//#define USE_MAP_GROUNDBASE
+
+// Debug
+// #define USE_MAP_MINITEST
+
+/*********************/
+/* End Map Selection */
+/*********************/
+
+#endif
+
+// Tether
+#ifdef USE_MAP_TETHER
+#include "../tether/tether.dm"
+#endif
+
+// Stellar Delight
+#ifdef USE_MAP_STELLARDELIGHT
+#include "../stellar_delight/stellar_delight.dm"
+#endif
+
+// Groundbase
+#ifdef USE_MAP_GROUNDBASE
+#include "../groundbase/groundbase.dm"
+#endif
+
+#ifdef USE_MAP_MINITEST
+#include "../virgo_minitest/virgo_minitest.dm"
+#endif

tgui/.gitignore

@@ -14,9 +14,9 @@ package-lock.json
 
 ## Build artifacts
 /public/.tmp/**/*
-/public/*.map
-/public/tgui-bench.bundle.js
-/public/tgui-bench.bundle.css
+/public/**/*
+!/public/*.html
+!/public/tgui-polyfill.min.js
 /coverage
 
 ## Previously ignored locations that are kept to avoid confusing git

tools/Runtime Condenser/Input.txt

@@ -92,7 +92,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=21;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=21;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -101,7 +101,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=19;icon-y=15;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=19;icon-y=15;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -110,7 +110,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=12;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=12;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -119,7 +119,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=12;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=12;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -128,7 +128,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=20;icon-y=15;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=20;icon-y=15;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -137,7 +137,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=19;icon-y=19;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=19;icon-y=19;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -146,7 +146,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=19;icon-y=18;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=19;icon-y=18;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -155,7 +155,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=19;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=19;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -164,7 +164,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=19;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=19;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -173,7 +173,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=13;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=13;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -182,7 +182,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Reese Marcotte (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Reese Marcotte (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Reese Marcotte (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=17;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (169,125,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=17;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -288,7 +288,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Ellen Quinn (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Ellen Quinn (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Ellen Quinn (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=21;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=21;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -297,7 +297,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Ellen Quinn (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Ellen Quinn (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Ellen Quinn (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=14;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=14;left=1;scr...")
 Fri Jul 13 20:36:29 2012
@@ -742,7 +742,7 @@ proc name: attackby (/turf/simulated/wall/attackby)
   usr: Monte Smail (/mob/living/carbon/human)
   src: the plating (176,172,5) (/turf/simulated/floor/plating)
   call stack:
-the plating (176,172,5) (/turf/simulated/floor/plating): attackby(Diamond Mining Drill (/obj/item/weapon/pickaxe/diamonddrill), Monte Smail (/mob/living/carbon/human))
+the plating (176,172,5) (/turf/simulated/floor/plating): attackby(Diamond Mining Drill (/obj/item/pickaxe/diamonddrill), Monte Smail (/mob/living/carbon/human))
 the plating (176,172,5) (/turf/simulated/floor/plating): DblClick(the plating (176,172,5) (/turf/simulated/floor/plating), "mapwindow.map", "icon-x=15;icon-y=6;left=1;scre...")
 the plating (176,172,5) (/turf/simulated/floor/plating): DblClick(the plating (176,172,5) (/turf/simulated/floor/plating), "mapwindow.map", "icon-x=15;icon-y=6;left=1;scre...")
 the plating (176,172,5) (/turf/simulated/floor/plating): Click(the plating (176,172,5) (/turf/simulated/floor/plating), "mapwindow.map", "icon-x=15;icon-y=6;left=1;scre...")
@@ -2458,8 +2458,8 @@ proc name: mergeConnectedNetworksOnTurf (/obj/structure/cable/proc/mergeConnecte
   src: the power cable (/obj/structure/cable)
   call stack:
 the power cable (/obj/structure/cable): mergeConnectedNetworksOnTurf()
-the cable coil (/obj/item/weapon/cable_coil/orange): turf place(the plating (87,80,1) (/turf/simulated/floor/plating), Josue Sandford (/mob/living/carbon/human))
-the plating (87,80,1) (/turf/simulated/floor/plating): attackby(the cable coil (/obj/item/weapon/cable_coil/orange), Josue Sandford (/mob/living/carbon/human))
+the cable coil (/obj/item/cable_coil/orange): turf place(the plating (87,80,1) (/turf/simulated/floor/plating), Josue Sandford (/mob/living/carbon/human))
+the plating (87,80,1) (/turf/simulated/floor/plating): attackby(the cable coil (/obj/item/cable_coil/orange), Josue Sandford (/mob/living/carbon/human))
 the plating (87,80,1) (/turf/simulated/floor/plating): DblClick(the plating (87,80,1) (/turf/simulated/floor/plating), "mapwindow.map", "icon-x=17;icon-y=28;left=1;scr...")
 the plating (87,80,1) (/turf/simulated/floor/plating): DblClick(the plating (87,80,1) (/turf/simulated/floor/plating), "mapwindow.map", "icon-x=17;icon-y=28;left=1;scr...")
 the plating (87,80,1) (/turf/simulated/floor/plating): Click(the plating (87,80,1) (/turf/simulated/floor/plating), "mapwindow.map", "icon-x=17;icon-y=28;left=1;scr...")
@@ -2471,8 +2471,8 @@ proc name: merge powernets (/datum/powernet/proc/merge_powernets)
   call stack:
 /datum/powernet (/datum/powernet): merge powernets(null)
 the power cable (/obj/structure/cable): mergeConnectedNetworksOnTurf()
-the cable piece (/obj/item/weapon/cable_coil): cable join(the power cable (/obj/structure/cable), Darin Keppel (/mob/living/carbon/human))
-the power cable (/obj/structure/cable): attackby(the cable piece (/obj/item/weapon/cable_coil), Darin Keppel (/mob/living/carbon/human))
+the cable piece (/obj/item/cable_coil): cable join(the power cable (/obj/structure/cable), Darin Keppel (/mob/living/carbon/human))
+the power cable (/obj/structure/cable): attackby(the cable piece (/obj/item/cable_coil), Darin Keppel (/mob/living/carbon/human))
 the power cable (/obj/structure/cable): DblClick(the floor (105,80,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=29;icon-y=17;left=1;scr...")
 the power cable (/obj/structure/cable): Click(the floor (105,80,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=29;icon-y=17;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -2481,7 +2481,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Jace Johnson (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Jace Johnson (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Jace Johnson (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=19;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=19;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -2490,7 +2490,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Jace Johnson (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Jace Johnson (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Jace Johnson (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=19;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=19;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -2499,7 +2499,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Jace Johnson (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Jace Johnson (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Jace Johnson (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=12;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=12;left=1;scr...")
 runtime error: Cannot read null.slot_flags
@@ -2518,7 +2518,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Jace Johnson (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Jace Johnson (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Jace Johnson (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=16;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=16;left=1;scr...")
 runtime error: Cannot read null.total_volume
@@ -2527,7 +2527,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Jace Johnson (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Jace Johnson (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Jace Johnson (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=18;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=18;left=1;scr...")
 Sat Jul 14 14:26:55 2012
@@ -2819,8 +2819,8 @@ proc name: mergeConnectedNetworksOnTurf (/obj/structure/cable/proc/mergeConnecte
   src: the power cable (/obj/structure/cable)
   call stack:
 the power cable (/obj/structure/cable): mergeConnectedNetworksOnTurf()
-the cable piece (/obj/item/weapon/cable_coil): cable join(the power cable (/obj/structure/cable), Tyrion Lannister (/mob/living/carbon/human))
-the power cable (/obj/structure/cable): attackby(the cable piece (/obj/item/weapon/cable_coil), Tyrion Lannister (/mob/living/carbon/human))
+the cable piece (/obj/item/cable_coil): cable join(the power cable (/obj/structure/cable), Tyrion Lannister (/mob/living/carbon/human))
+the power cable (/obj/structure/cable): attackby(the cable piece (/obj/item/cable_coil), Tyrion Lannister (/mob/living/carbon/human))
 the power cable (/obj/structure/cable): DblClick(the floor (174,138,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=17;left=1;scr...")
 the power cable (/obj/structure/cable): Click(the floor (174,138,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=16;icon-y=17;left=1;scr...")
 runtime error: Cannot read null.slot_flags
@@ -3243,7 +3243,7 @@ runtime error: Cannot read null.len
 proc name: mergeRecordLists (/proc/mergeRecordLists)
   source file: helpers.dm,260
 runtime error: Cannot read null.reagents
-proc name: fire syringe (/obj/item/weapon/gun/syringe/proc/fire_syringe)
+proc name: fire syringe (/obj/item/gun/syringe/proc/fire_syringe)
   source file: Chemistry-Tools.dm,462
 runtime error: Cannot read null.slot_flags
 proc name: db click (/mob/living/carbon/human/db_click)
@@ -3453,7 +3453,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Dutch Hargrave (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Dutch Hargrave (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Dutch Hargrave (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=11;left=1;scr...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=18;icon-y=11;left=1;scr...")
 runtime error: Cannot read null.reagents
@@ -3462,7 +3462,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Dutch Hargrave (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Dutch Hargrave (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Dutch Hargrave (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=6;left=1;scre...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=17;icon-y=6;left=1;scre...")
 runtime error: Cannot read null.total_volume
@@ -3471,7 +3471,7 @@ proc name: attackby (/obj/machinery/reagentgrinder/attackby)
   usr: Dutch Hargrave (/mob/living/carbon/human)
   src: All-In-One Grinder (/obj/machinery/reagentgrinder)
   call stack:
-All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/weapon/plantbag), Dutch Hargrave (/mob/living/carbon/human))
+All-In-One Grinder (/obj/machinery/reagentgrinder): attackby(Plant Bag (/obj/item/plantbag), Dutch Hargrave (/mob/living/carbon/human))
 All-In-One Grinder (/obj/machinery/reagentgrinder): DblClick(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=20;icon-y=6;left=1;scre...")
 All-In-One Grinder (/obj/machinery/reagentgrinder): Click(the floor (154,134,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=20;icon-y=6;left=1;scre...")
 Rebooted server.
@@ -3995,15 +3995,15 @@ the storage1 (/obj/screen): attack hand(Tyson Roby (/mob/living/carbon/human), 1
 the storage1 (/obj/screen): DblClick(null, null, null)
 the storage1 (/obj/screen): Click(null, "mapwindow.map", "icon-x=19;icon-y=16;left=1;scr...")
 runtime error: Cannot read null.w_class
-proc name: attackby (/obj/item/weapon/storage/attackby)
+proc name: attackby (/obj/item/storage/attackby)
   source file: storage.dm,187
   usr: Samuel York (/mob/living/carbon/human)
-  src: the backpack (/obj/item/weapon/storage/backpack)
+  src: the backpack (/obj/item/storage/backpack)
   call stack:
-the backpack (/obj/item/weapon/storage/backpack): attackby(null, Samuel York (/mob/living/carbon/human))
-the backpack (/obj/item/weapon/storage/backpack): attackby(null, Samuel York (/mob/living/carbon/human))
-the backpack (/obj/item/weapon/storage/backpack): DblClick(null, "mapwindow.map", "icon-x=17;icon-y=18;left=1;scr...")
-the backpack (/obj/item/weapon/storage/backpack): Click(null, "mapwindow.map", "icon-x=17;icon-y=18;left=1;scr...")
+the backpack (/obj/item/storage/backpack): attackby(null, Samuel York (/mob/living/carbon/human))
+the backpack (/obj/item/storage/backpack): attackby(null, Samuel York (/mob/living/carbon/human))
+the backpack (/obj/item/storage/backpack): DblClick(null, "mapwindow.map", "icon-x=17;icon-y=18;left=1;scr...")
+the backpack (/obj/item/storage/backpack): Click(null, "mapwindow.map", "icon-x=17;icon-y=18;left=1;scr...")
 Rebooted server.
 Sun Jul 15 04:43:18 2012
 Running TG Revision Number: 4060.
@@ -4096,8 +4096,8 @@ proc name: merge powernets (/datum/powernet/proc/merge_powernets)
   call stack:
 /datum/powernet (/datum/powernet): merge powernets(null)
 the power cable (/obj/structure/cable): mergeConnectedNetworksOnTurf()
-the cable coil (/obj/item/weapon/cable_coil): turf place(the floor (87,115,1) (/turf/simulated/floor), Stephen Cox (/mob/living/carbon/human))
-the floor (87,115,1) (/turf/simulated/floor): attackby(the cable coil (/obj/item/weapon/cable_coil), Stephen Cox (/mob/living/carbon/human))
+the cable coil (/obj/item/cable_coil): turf place(the floor (87,115,1) (/turf/simulated/floor), Stephen Cox (/mob/living/carbon/human))
+the floor (87,115,1) (/turf/simulated/floor): attackby(the cable coil (/obj/item/cable_coil), Stephen Cox (/mob/living/carbon/human))
 the floor (87,115,1) (/turf/simulated/floor): DblClick(the floor (87,115,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=26;icon-y=18;left=1;scr...")
 the floor (87,115,1) (/turf/simulated/floor): DblClick(the floor (87,115,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=26;icon-y=18;left=1;scr...")
 the floor (87,115,1) (/turf/simulated/floor): Click(the floor (87,115,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=26;icon-y=18;left=1;scr...")
@@ -4109,8 +4109,8 @@ proc name: merge powernets (/datum/powernet/proc/merge_powernets)
   call stack:
 /datum/powernet (/datum/powernet): merge powernets(null)
 the power cable (/obj/structure/cable): mergeConnectedNetworksOnTurf()
-the cable coil (/obj/item/weapon/cable_coil): turf place(the floor (87,115,1) (/turf/simulated/floor), Stephen Cox (/mob/living/carbon/human))
-the floor (87,115,1) (/turf/simulated/floor): attackby(the cable coil (/obj/item/weapon/cable_coil), Stephen Cox (/mob/living/carbon/human))
+the cable coil (/obj/item/cable_coil): turf place(the floor (87,115,1) (/turf/simulated/floor), Stephen Cox (/mob/living/carbon/human))
+the floor (87,115,1) (/turf/simulated/floor): attackby(the cable coil (/obj/item/cable_coil), Stephen Cox (/mob/living/carbon/human))
 the floor (87,115,1) (/turf/simulated/floor): DblClick(the floor (87,115,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=26;icon-y=18;left=1;scr...")
 the floor (87,115,1) (/turf/simulated/floor): DblClick(the floor (87,115,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=26;icon-y=18;left=1;scr...")
 the floor (87,115,1) (/turf/simulated/floor): Click(the floor (87,115,1) (/turf/simulated/floor), "mapwindow.map", "icon-x=26;icon-y=18;left=1;scr...")
@@ -4437,4 +4437,4 @@ Rebooted server.
 Running TG Revision Number: 4060.
 Stopped server.
 
-*** End Log: Sun Jul 15 13:55:08 2012 ***
+*** End Log: Sun Jul 15 13:55:08 2012 ***

tools/ci/compile_and_run.sh

@@ -5,43 +5,19 @@ NC='\033[0m'
 
 source $HOME/BYOND/byond/bin/byondsetup
 
+# Clean up between steps so Juke doesn't refuse to recompile with different -D options
+rm vorestation.dmb
+
 # Copy example configs
 cp config/example/* config/
 
-# Define any unit test defines that need to run
-echo "#define ${TEST_DEFINE} 1" > ${TEST_FILE}
-
-replace=${REPLACE}
-# Messy map compile code
-if grep -q '#include[[:space:]]\"maps\\tether\\tether.dm\"' $BASENAME.dme && $replace; then
-  sed -i 's/#include[[:space:]]\"maps\\tether\\tether.dm\"/#include\ \"maps\\'${MAP}'\\'${MAP}'.dm\"/g' $BASENAME.dme
-  replace=false
-elif grep -q '#include[[:space:]]\"maps\\stellar_delight\\stellar_delight.dm\"' $BASENAME.dme && $replace; then
-  sed -i 's/#include[[:space:]]\"maps\\stellar_delight\\stellar_delight.dm\"/#include\ \"maps\\'${MAP}'\\'${MAP}'.dm\"/g' $BASENAME.dme
-  replace=false
-elif grep -q '#include[[:space:]]\"maps\\groundbase\\groundbase.dm\"' $BASENAME.dme && $replace; then
-  sed -i 's/#include[[:space:]]\"maps\\groundbase\\groundbase.dm\"/#include\ \"maps\\'${MAP}'\\'${MAP}'.dm\"/g' $BASENAME.dme
-  replace=false
-fi
-
 # Compile a copy of the codebase, and print errors as Github Actions annotations
-tools/build/build --ci dm -DCIBUILDING -DCITESTING
+tools/build/build --ci dm -DCIBUILDING -DCITESTING ${EXTRA_ARGS}
 exitVal=$?
-# if [ $exitVal -gt 0 ]; then
-# 	sed -E -n 's/^(.+?\.dm):([0-9]+):(error|warning): (.+)$/::\3 file=\1,line=\2::\4/gp'
-# fi
 
 # Compile failed on map_test
-if [ $exitVal -gt 0 ] && [ $TEST_DEFINE = "MAP_TEST" ]; then
-  echo "${RED}Some POIs appear to contain map-specific objects or code. Please isolate map-specific items/code from POIs.${NC}"
-  exit 1
-# Compile failed on away_mission_test
-elif [ $exitVal -gt 0 ] && [ $TEST_DEFINE = "AWAY_MISSION_TEST" ]; then
-  echo "${RED}Some away missions failed to compile. Please check them for missing items/objects by trying to compile them in DreamMaker.${NC}"
-  exit 1
-# Compile failed on unit_test
-elif [ $exitVal -gt 0 ] && [ $TEST_DEFINE = "UNIT_TEST" ]; then
-  echo "${RED}Compiling the codebase normally failed. Please review the compile errors and correct them, usually before making your PR.${NC}"
+if [ $exitVal -gt 0 ]; then
+  echo "${RED}Errors were produced during CI with arguments ${EXTRA_ARGS}, please review CI logs.${NC}"
   exit 1
 fi
 

vorestation.dme

@@ -12,11 +12,8 @@
 // BEGIN_INCLUDE
 #include "code\__byond_version_compat.dm"
 #include "code\__spaceman_dmm.dm"
-#include "code\_away_mission_tests.dm"
 #include "code\_macros.dm"
 #include "code\_macros_vr.dm"
-#include "code\_map_tests.dm"
-#include "code\_unit_tests.dm"
 #include "code\global.dm"
 #include "code\global_init.dm"
 #include "code\global_vr.dm"
@@ -2033,6 +2030,7 @@
 #include "code\modules\client\preferences\middleware\_middleware.dm"
 #include "code\modules\client\preferences\migrations\13_preferences.dm"
 #include "code\modules\client\preferences\migrations\14_nifs.dm"
+#include "code\modules\client\preferences\migrations\15_nif_path.dm"
 #include "code\modules\client\preferences\types\admin.dm"
 #include "code\modules\client\preferences\types\auto_fit_viewport.dm"
 #include "code\modules\client\preferences\types\chat.dm"
@@ -4357,7 +4355,6 @@
 #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\stellar_delight\stellar_delight.dm"
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\admin_use_vr\event_autonomous_drone.dm"
@@ -4368,5 +4365,6 @@
 #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\_map_selection.dm"
 #include "maps\~map_system\maps.dm"
 // END_INCLUDE