'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.

Also readds vore monkeys
2025-12-11 10:43:20 +00:00 · 2020-07-26 12:48:22 -04:00
parent 94250e9c90
commit 5bc7f0bd72
21 changed files with 31 additions and 367 deletions
--- a/code/__defines/_globals.dm
+++ b/code/__defines/_globals.dm
@@ -1,38 +0,0 @@
-//See controllers/globals.dm
-#define GLOBAL_MANAGED(X, InitValue)\
-/datum/controller/global_vars/proc/InitGlobal##X(){\
-    ##X = ##InitValue;\
-    gvars_datum_init_order += #X;\
-}
-#define GLOBAL_UNMANAGED(X) /datum/controller/global_vars/proc/InitGlobal##X() { return; }
-
-#ifndef TESTING
-#define GLOBAL_PROTECT(X)\
-/datum/controller/global_vars/InitGlobal##X(){\
-    ..();\
-    gvars_datum_protected_varlist[#X] = TRUE;\
-}
-#else
-#define GLOBAL_PROTECT(X)
-#endif
-
-#define GLOBAL_REAL_VAR(X) var/global/##X
-#define GLOBAL_REAL(X, Typepath) var/global##Typepath/##X
-
-#define GLOBAL_RAW(X) /datum/controller/global_vars/var/global##X
-
-#define GLOBAL_VAR_INIT(X, InitValue) GLOBAL_RAW(/##X); GLOBAL_MANAGED(X, InitValue)
-
-#define GLOBAL_VAR_CONST(X, InitValue) GLOBAL_RAW(/const/##X) = InitValue; GLOBAL_UNMANAGED(X)
-
-#define GLOBAL_LIST_INIT(X, InitValue) GLOBAL_RAW(/list/##X); GLOBAL_MANAGED(X, InitValue)
-
-#define GLOBAL_LIST_EMPTY(X) GLOBAL_LIST_INIT(X, list())
-
-#define GLOBAL_DATUM_INIT(X, Typepath, InitValue) GLOBAL_RAW(Typepath/##X); GLOBAL_MANAGED(X, InitValue)
-
-#define GLOBAL_VAR(X) GLOBAL_RAW(/##X); GLOBAL_UNMANAGED(X)
-
-#define GLOBAL_LIST(X) GLOBAL_RAW(/list/##X); GLOBAL_UNMANAGED(X)
-
-#define GLOBAL_DATUM(X, Typepath) GLOBAL_RAW(Typepath/##X); GLOBAL_UNMANAGED(X)
--- a/code/__defines/construction.dm
+++ b/code/__defines/construction.dm
@@ -62,24 +62,6 @@
 #define PIPING_ONE_PER_TURF 2 				//can only be built if nothing else with this flag is on the tile already.
 #define PIPING_DEFAULT_LAYER_ONLY 4			//can only exist at PIPING_LAYER_DEFAULT
 #define PIPING_CARDINAL_AUTONORMALIZE 8		//north/south east/west doesn't matter, auto normalize on build.
-//YW Additions
-// Disposals Construction
-//
-#define DISPOSAL_PIPE_STRAIGHT 0
-#define DISPOSAL_PIPE_CORNER 1
-#define DISPOSAL_PIPE_JUNCTION 2
-#define DISPOSAL_PIPE_JUNCTION_FLIPPED 3
-#define DISPOSAL_PIPE_JUNCTION_Y 4
-#define DISPOSAL_PIPE_TRUNK 5
-#define DISPOSAL_PIPE_BIN 6
-#define DISPOSAL_PIPE_OUTLET 7
-#define DISPOSAL_PIPE_CHUTE 8
-#define DISPOSAL_PIPE_SORTER 9
-#define DISPOSAL_PIPE_SORTER_FLIPPED 10
-#define DISPOSAL_PIPE_UPWARD 11
-#define DISPOSAL_PIPE_DOWNWARD 12
-#define DISPOSAL_PIPE_TAGGER 13
-#define DISPOSAL_PIPE_TAGGER_PARTIAL 14

 // Disposals Construction
 // Future: Eliminate these type codes by adding disposals equivilent of pipe_state.
--- a/code/__defines/server_tools.config.dm
+++ b/code/__defines/server_tools.config.dm
@@ -1,8 +0,0 @@
-#define SERVER_TOOLS_EXTERNAL_CONFIGURATION
-#define SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(Name, Value) GLOBAL_VAR_INIT(##Name, ##Value); GLOBAL_PROTECT(##Name)
-#define SERVER_TOOLS_READ_GLOBAL(Name) GLOB.##Name
-#define SERVER_TOOLS_WRITE_GLOBAL(Name, Value) GLOB.##Name = ##Value
-#define SERVER_TOOLS_WORLD_ANNOUNCE(message) to_chat(world, "<span class='boldannounce'>[html_encode(##message)]</span>")
-#define SERVER_TOOLS_LOG(message) log_world("SERVICE: [##message]")
-#define SERVER_TOOLS_NOTIFY_ADMINS(event) message_admins(##event)
-#define SERVER_TOOLS_CLIENT_COUNT player_list.len
--- a/code/__defines/server_tools.dm
+++ b/code/__defines/server_tools.dm
@@ -1,101 +0,0 @@
-// /tg/station 13 server tools API
-#define SERVICE_API_VERSION_STRING "3.2.0.3"
-
-//CONFIGURATION
-//use this define if you want to do configuration outside of this file
-//Required hooks:
-
-//Put this somewhere in /world/New() that is always run
-#define SERVER_TOOLS_ON_NEW ServiceInit()
-//Put this somewhere in /world/Topic(T, Addr, Master, Keys) that is always run before T is modified
-#define SERVER_TOOLS_ON_TOPIC var/service_topic_return = ServiceCommand(params2list(T)); if(service_topic_return) return service_topic_return
-//Put at the beginning of world/Reboot(reason)
-#define SERVER_TOOLS_ON_REBOOT ServiceReboot()
-
-//Optional callable functions:
-
-//Returns the string version of the API
-#define SERVER_TOOLS_API_VERSION ServiceAPIVersion()
-//Returns TRUE if the world was launched under the server tools and the API matches, FALSE otherwise
-//No function below this succeed if this is FALSE
-#define SERVER_TOOLS_PRESENT RunningService()
-//Gets the current version of the service running the server
-#define SERVER_TOOLS_VERSION ServiceVersion()
-//Forces a hard reboot of BYOND by ending the process
-//unlike del(world) clients will try to reconnect
-//If the service has not requested a shutdown, the world will reboot shortly after
-#define SERVER_TOOLS_REBOOT_BYOND(silent) world.ServiceEndProcess(silent)
-/*
-	Gets the list of any testmerged github pull requests
-	"[PR Number]" => list(
-		"title" -> PR title
-		"commit" -> Full hash of commit merged
-		"author" -> Github username of the author of the PR
-	)
-*/
-#define SERVER_TOOLS_PR_LIST GetTestMerges()
-//Sends a message to connected game chats
-#define SERVER_TOOLS_CHAT_BROADCAST(message) world.ChatBroadcast(message)
-//Sends a message to connected admin chats
-#define SERVER_TOOLS_RELAY_BROADCAST(message) world.AdminBroadcast(message)
-
-//IMPLEMENTATION
-
-#define REBOOT_MODE_NORMAL 0
-#define REBOOT_MODE_HARD 1
-#define REBOOT_MODE_SHUTDOWN 2
-
-#define SERVICE_WORLD_PARAM "server_service"
-#define SERVICE_VERSION_PARAM "server_service_version"
-#define SERVICE_INSTANCE_PARAM "server_instance"
-#define SERVICE_PR_TEST_JSON "prtestjob.json"
-#define SERVICE_INTERFACE_DLL "TGDreamDaemonBridge.dll"
-#define SERVICE_INTERFACE_FUNCTION "DDEntryPoint"
-
-#define SERVICE_CMD_HARD_REBOOT "hard_reboot"
-#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown"
-#define SERVICE_CMD_WORLD_ANNOUNCE "world_announce"
-#define SERVICE_CMD_LIST_CUSTOM "list_custom_commands"
-#define SERVICE_CMD_API_COMPATIBLE "api_compat"
-#define SERVICE_CMD_PLAYER_COUNT "client_count"
-
-#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
-#define SERVICE_CMD_PARAM_COMMAND "command"
-#define SERVICE_CMD_PARAM_SENDER "sender"
-#define SERVICE_CMD_PARAM_CUSTOM "custom"
-
-#define SERVICE_JSON_PARAM_HELPTEXT "help_text"
-#define SERVICE_JSON_PARAM_ADMINONLY "admin_only"
-#define SERVICE_JSON_PARAM_REQUIREDPARAMETERS "required_parameters"
-
-#define SERVICE_REQUEST_KILL_PROCESS "killme"
-#define SERVICE_REQUEST_KILL_PROCESS_SILENT "killmesilent"
-#define SERVICE_REQUEST_IRC_BROADCAST "irc"
-#define SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE "send2irc"
-#define SERVICE_REQUEST_WORLD_REBOOT "worldreboot"
-#define SERVICE_REQUEST_API_VERSION "api_ver"
-
-#define SERVICE_RETURN_SUCCESS "SUCCESS"
-
-/*
-The MIT License
-Copyright (c) 2017 Jordan Brown
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
--- a/code/__defines/species_languages.dm
+++ b/code/__defines/species_languages.dm
@@ -47,7 +47,6 @@
 #define LANGUAGE_SOL_COMMON "Sol Common"
 #define LANGUAGE_UNATHI "Sinta'unathi"
 #define LANGUAGE_SIIK "Siik"
-#define LANGUAGE_SIIK_TAJR "Siik Tajr"
 #define LANGUAGE_SKRELLIAN "Common Skrellian"
 #define LANGUAGE_TRADEBAND "Tradeband"
 #define LANGUAGE_GUTTER "Gutter"
--- a/code/__defines/species_languages_YW.dm
+++ b/code/__defines/species_languages_YW.dm
@@ -1 +1,2 @@
 #define LANGUAGE_PSIONIC "Psionic Communication"
+#define LANGUAGE_SIIK_TAJR "Siik Tajr"
--- a/code/datums/supplypacks/contraband.dm
+++ b/code/datums/supplypacks/contraband.dm
@@ -14,7 +14,7 @@
 			)

 	name = "Contraband crate"
-	cost = 500
+	cost = 25
 	containertype = /obj/structure/closet/crate
 	containername = "Unlabeled crate"
 	contraband = 1
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ b/code/game/gamemodes/sandbox/h_sandbox.dm
@@ -136,6 +136,8 @@ datum/hSB
 							continue
 						if(istype(O, /obj/item/device/camera))
 							continue
+						if(istype(O, /obj/item/weapon/dummy))
+							continue
 						if(istype(O, /obj/item/weapon/melee/energy/sword))
 							continue
 						if(istype(O, /obj/structure))
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -52,7 +52,6 @@
 			icon_state = "guest_invalid"
 			expiration_time = world.time
 			expired = 1
-			return
 	return ..()

 /obj/item/weapon/card/id/guest/Initialize()
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -160,6 +160,9 @@ Nah
 	if((. = ..()))
 		return
 	if(href_list["dmake"])
+		if(unwrenched || !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
+			usr << browse(null, "window=pipedispenser")
+			return
 		if(!wait)
 			var/ptype = text2num(href_list["dmake"])
 			var/pdir = (href_list["dir"] ? text2num(href_list["dir"]) : NORTH)
--- a/code/game/mecha/combat/gorilla.dm
+++ b/code/game/mecha/combat/gorilla.dm
@@ -12,7 +12,7 @@
 	opacity = 0 // Because there's big tall legs to look through. Also it looks fucky if this is set to 1.
 	deflect_chance = 50
 	damage_absorption = list("brute"=0.1,"fire"=0.7,"bullet"=0.1,"laser"=0.6,"energy"=0.7,"bomb"=0.7) //values show how much damage will pass through, not how much will be absorbed.
-	max_temperature = 25000
+	max_temperature = 35000
 	infra_luminosity = 3
 	wreckage = /obj/effect/decal/mecha_wreckage/gorilla
 	add_req_access = 0
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -178,7 +178,7 @@
 		var/mob/living/carbon/human/H = target
 		affecting = H.get_organ(hit_zone)

-	if(user.a_intent == I_GRAB || user.a_intent == I_HURT) // YW Edit
+	if(user.a_intent == I_GRAB || user.a_intent == I_HURT)
 		. = ..()
 		//whacking someone causes a much poorer electrical contact than deliberately prodding them.
 		agony *= 0.5
--- a/code/modules/mining/reward_yw.dm
+++ b/code/modules/mining/reward_yw.dm
@@ -1,158 +0,0 @@
-/obj/machinery/miningreward
-	name = "Mining reward machine"
-	desc = "Feed coins, get something worth your time.. Ish..."
-	icon = 'icons/obj/machines/antimatter.dmi'
-	icon_state = "control"
-	anchored = 1
-	density = 1
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 10
-
-	var/totalmoney = 0
-	var/list/products	= list(
-								/obj/item/device/binoculars,
-								/obj/item/weapon/pickaxe/silver,
-								/obj/item/weapon/pickaxe/drill,
-								/obj/item/weapon/pickaxe/jackhammer,
-								/obj/item/weapon/pickaxe/gold,
-								/obj/item/weapon/pickaxe/plasmacutter,
-								/obj/item/weapon/pickaxe/diamond,
-								/obj/item/weapon/pickaxe/diamonddrill,
-								/obj/vehicle/bike/,
-								/obj/vehicle/train/rover/engine,
-								/obj/vehicle/train/rover/trolley)
-
-	var/list/prices		= list( /obj/item/device/binoculars = 200,
-								/obj/item/weapon/pickaxe/silver = 200,
-								/obj/item/weapon/pickaxe/drill = 240,
-								/obj/item/weapon/pickaxe/jackhammer = 300,
-								/obj/item/weapon/pickaxe/gold = 360,
-								/obj/item/weapon/pickaxe/plasmacutter = 460,
-								/obj/item/weapon/pickaxe/diamond = 500,
-								/obj/item/weapon/pickaxe/diamonddrill = 600,
-								/obj/vehicle/bike/ = 1500,
-								/obj/vehicle/train/rover/engine = 3000,
-								/obj/vehicle/train/rover/trolley = 200)
-
-
-/obj/machinery/miningreward/New()
-	..()
-
-
-/obj/machinery/miningreward/Destroy()//Perhaps damage and run stability checks rather than just qdel on the others
-	..()
-
-
-/obj/machinery/miningreward/emp_act(severity)
-	..()
-	return 0
-
-
-/obj/machinery/miningreward/bullet_act(var/obj/item/projectile/Proj)
-	return 0
-
-
-
-/obj/machinery/miningreward/update_icon()
-	return
-
-
-/obj/machinery/miningreward/attackby(obj/item/W, mob/user)
-	if(!istype(W) || !user) return
-	if(istype(W, /obj/item/weapon/wrench))
-		if(!anchored)
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
-			user.visible_message("[user.name] secures the [src.name] to the floor.", \
-				"You secure the anchor bolts to the floor.", \
-				"You hear a ratchet")
-			src.anchored = 1
-		else
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
-			user.visible_message("[user.name] unsecures the [src.name].", \
-				"You remove the anchor bolts.", \
-				"You hear a ratchet")
-			src.anchored = 0
-		return
-
-	if(istype(W, /obj/item/weapon/coin))
-		user.remove_from_mob(W)
-		W.loc = src
-		user.update_icons()
-		user.visible_message("[user.name] inserts a [W.name] into the [src.name].", \
-				"You insert a [W.name].", \
-				"You hear a thunk.")
-
-		if(istype(W, /obj/item/weapon/coin/iron))
-			totalmoney += 1
-		else if(istype(W, /obj/item/weapon/coin/phoron))
-			totalmoney += 2
-		else if(istype(W, /obj/item/weapon/coin/uranium))
-			totalmoney += 3
-		else if(istype(W, /obj/item/weapon/coin/platinum))
-			totalmoney += 4
-		else if(istype(W, /obj/item/weapon/coin/silver))
-			totalmoney += 5
-		else if(istype(W, /obj/item/weapon/coin/gold))
-			totalmoney += 10
-		else if(istype(W, /obj/item/weapon/coin/diamond))
-			totalmoney += 20
-		return
-
-	..()
-	return
-
-
-/obj/machinery/miningreward/attack_hand(mob/user as mob)
-	if(anchored)
-		interact(user)
-	return
-
-
-/obj/machinery/miningreward/interact(mob/user)
-	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
-		if(!istype(user, /mob/living/silicon/ai))
-			user.unset_machine()
-			user << browse(null, "window=RWcontrol")
-			return
-	user.set_machine(src)
-
-	var/dat = ""
-	dat += "Mining Reward Panel<BR>"
-	dat += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
-	dat += "Points: [totalmoney] <BR>"
-
-	for(var/i=1;i<=products.len;++i)
-		var/product = products[i]
-		var/obj/P = new product()
-		dat += "<A href='?src=\ref[src];task=vend;id=[i]'>[P.name] - [(products[i] in prices) ? prices[products[i]] : 0]</A><BR>"
-
-	user << browse(dat, "window=RWcontrol;size=420x500")
-	onclose(user, "RWcontrol")
-	return
-
-
-/obj/machinery/miningreward/Topic(href, href_list)
-	..()
-	//Ignore input if we are broken or guy is not touching us, AI can control from a ways away
-	if(stat & (BROKEN|NOPOWER) || (get_dist(src, usr) > 1 && !istype(usr, /mob/living/silicon/ai)))
-		usr.unset_machine()
-		usr << browse(null, "window=RWcontrol")
-		return
-
-	else if(href_list["close"])
-		usr << browse(null, "window=RWcontrol")
-		usr.unset_machine()
-		return
-
-	else if(href_list["task"] && href_list["task"] == "vend")
-		var/ID = text2num(href_list["id"])
-		var/product = products[ID]
-		if(products[product] != 0 && totalmoney >= prices[product])
-			totalmoney -= prices[product]
-			products[product]-=1
-			var/obj/prod = new product
-			prod.loc = src.loc
-
-	updateDialog()
-	return
--- a/icons/mob/human_races/monkeys/r_sergaling_vr.dmi
+++ b/icons/mob/human_races/monkeys/r_sergaling_vr.dmi
--- a/icons/mob/human_races/monkeys/r_sobaka_vr.dmi
+++ b/icons/mob/human_races/monkeys/r_sobaka_vr.dmi
--- a/icons/mob/human_races/monkeys/r_sparra_vr.dmi
+++ b/icons/mob/human_races/monkeys/r_sparra_vr.dmi
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -681,7 +681,6 @@ th.Silicon {
    color: red;
 }

-/* YW EDIT: green -> lime */
 .toxin {
    color: lime;
 }
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -26,7 +26,6 @@
 #include "code\__datastructures\globals.dm"
 #include "code\__defines\__513_compatibility.dm"
 #include "code\__defines\_compile_options.dm"
-#include "code\__defines\_globals.dm"
 #include "code\__defines\_lists.dm"
 #include "code\__defines\_planes+layers.dm"
 #include "code\__defines\_planes+layers_vr.dm"
@@ -72,8 +71,6 @@
 #include "code\__defines\qdel.dm"
 #include "code\__defines\research.dm"
 #include "code\__defines\roguemining_vr.dm"
-#include "code\__defines\server_tools.config.dm"
-#include "code\__defines\server_tools.dm"
 #include "code\__defines\shields.dm"
 #include "code\__defines\shuttle.dm"
 #include "code\__defines\sound.dm"
@@ -259,7 +256,6 @@
 #include "code\controllers\subsystems\lighting.dm"
 #include "code\controllers\subsystems\machines.dm"
 #include "code\controllers\subsystems\mapping_vr.dm"
-#include "code\controllers\subsystems\mapping_yw.dm"
 #include "code\controllers\subsystems\mobs.dm"
 #include "code\controllers\subsystems\nanoui.dm"
 #include "code\controllers\subsystems\nightshift.dm"
@@ -665,8 +661,6 @@
 #include "code\game\gamemodes\nuclear\nuclear.dm"
 #include "code\game\gamemodes\nuclear\pinpointer.dm"
 #include "code\game\gamemodes\revolution\revolution.dm"
-#include "code\game\gamemodes\sandbox\h_sandbox.dm"
-#include "code\game\gamemodes\sandbox\sandbox.dm"
 #include "code\game\gamemodes\technomancer\catalog.dm"
 #include "code\game\gamemodes\technomancer\clothing.dm"
 #include "code\game\gamemodes\technomancer\core_obj.dm"
@@ -833,7 +827,6 @@
 #include "code\game\machinery\portable_turret_vr.dm"
 #include "code\game\machinery\recharger.dm"
 #include "code\game\machinery\rechargestation.dm"
-#include "code\game\machinery\records_scanner.dm"
 #include "code\game\machinery\requests_console.dm"
 #include "code\game\machinery\requests_console_vr.dm"
 #include "code\game\machinery\robot_fabricator.dm"
@@ -1476,7 +1469,6 @@
 #include "code\game\objects\structures\crates_lockers\closets\utility_closets_yw.dm"
 #include "code\game\objects\structures\crates_lockers\closets\walllocker.dm"
 #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
-#include "code\game\objects\structures\crates_lockers\closets\secure\antimatter_am.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\cargo_vr.dm"
@@ -1601,7 +1593,6 @@
 #include "code\modules\admin\IsBanned.dm"
 #include "code\modules\admin\map_capture.dm"
 #include "code\modules\admin\NewBan.dm"
-#include "code\modules\admin\newbanjob.dm"
 #include "code\modules\admin\news.dm"
 #include "code\modules\admin\persistence.dm"
 #include "code\modules\admin\player_notes.dm"
@@ -2115,8 +2106,6 @@
 #include "code\modules\events\supply_demand_vr.dm"
 #include "code\modules\events\viral_infection.dm"
 #include "code\modules\events\wallrot.dm"
-#include "code\modules\events\window_break.dm"
-#include "code\modules\events\wormholes.dm"
 #include "code\modules\examine\examine.dm"
 #include "code\modules\examine\stat_icons.dm"
 #include "code\modules\examine\descriptions\armor.dm"
@@ -2324,11 +2313,6 @@
 #include "code\modules\integrated_electronics\subtypes\time.dm"
 #include "code\modules\integrated_electronics\subtypes\trig.dm"
 #include "code\modules\integrated_electronics\~defines\~defines.dm"
-#include "code\modules\interserver shipping\_shipping_globals.dm"
-#include "code\modules\interserver shipping\computer_yw.dm"
-#include "code\modules\interserver shipping\shipping_api.dm"
-#include "code\modules\interserver shipping\shipping_hooks.dm"
-#include "code\modules\interserver shipping\shipping_requests.dm"
 #include "code\modules\library\lib_items.dm"
 #include "code\modules\library\lib_machines.dm"
 #include "code\modules\library\lib_readme.dm"
@@ -2608,6 +2592,7 @@
 #include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm"
 #include "code\modules\mob\living\carbon\human\species\outsider\skeleton.dm"
 #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm"
+#include "code\modules\mob\living\carbon\human\species\outsider\vox_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\shadekin\_defines.dm"
 #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin.dm"
 #include "code\modules\mob\living\carbon\human\species\shadekin\shadekin_abilities.dm"
@@ -2619,6 +2604,7 @@
 #include "code\modules\mob\living\carbon\human\species\station\greyYW.dm"
 #include "code\modules\mob\living\carbon\human\species\station\human_subspecies.dm"
 #include "code\modules\mob\living\carbon\human\species\station\monkey.dm"
+#include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm"
 #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\seromi.dm"
@@ -3121,8 +3107,8 @@
 #include "code\modules\paperwork\handlabeler.dm"
 #include "code\modules\paperwork\paper.dm"
 #include "code\modules\paperwork\paper_bundle.dm"
-#include "code\modules\paperwork\paper_yw.dm"
 #include "code\modules\paperwork\paper_sticky.dm"
+#include "code\modules\paperwork\paper_yw.dm"
 #include "code\modules\paperwork\paperbin.dm"
 #include "code\modules\paperwork\paperplane.dm"
 #include "code\modules\paperwork\papershredder.dm"
@@ -3135,6 +3121,12 @@
 #include "code\modules\persistence\graffiti.dm"
 #include "code\modules\persistence\noticeboard.dm"
 #include "code\modules\persistence\persistence.dm"
+#include "code\modules\persistence\datum\datum_filth.dm"
+#include "code\modules\persistence\datum\datum_graffiti.dm"
+#include "code\modules\persistence\datum\datum_paper.dm"
+#include "code\modules\persistence\datum\datum_paper_sticky.dm"
+#include "code\modules\persistence\datum\datum_trash.dm"
+#include "code\modules\persistence\datum\persistence_datum.dm"
 #include "code\modules\Phorochemistry\electrical_field.dm"
 #include "code\modules\Phorochemistry\misc_phoronics.dm"
 #include "code\modules\Phorochemistry\phoroanalyzer.dm"
@@ -3145,12 +3137,6 @@
 #include "code\modules\Phorochemistry\phororeagent.dm"
 #include "code\modules\Phorochemistry\phorotelepad.dm"
 #include "code\modules\planet\borealismajoris.dm"
-#include "code\modules\persistence\datum\datum_filth.dm"
-#include "code\modules\persistence\datum\datum_graffiti.dm"
-#include "code\modules\persistence\datum\datum_paper.dm"
-#include "code\modules\persistence\datum\datum_paper_sticky.dm"
-#include "code\modules\persistence\datum\datum_trash.dm"
-#include "code\modules\persistence\datum\persistence_datum.dm"
 #include "code\modules\planet\planet.dm"
 #include "code\modules\planet\time.dm"
 #include "code\modules\planet\weather.dm"
@@ -3810,8 +3796,6 @@
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"
 #include "maps\submaps\engine_submaps\engine_areas.dm"
-#include "maps\submaps\engine_submaps_yw\engine_yw.dm"
-#include "maps\submaps\engine_submaps_yw\engine_yw_index.dm"
 #include "maps\submaps\space_submaps\space.dm"
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\mountains\mountains.dm"