Module cleansing (#8431)

* removed legacy cargo moved plastic flap code to mining module removed legacy pda removed legacy holidays but kept christmas toys replaced clown pda in artist pink wardrobe with updated clown pda replaced theatre lookalike with true artist pink wardrobe moved fax to oldcode deleted a few more things * fix map * recursive explosions get the boot the old ones not the new stuff
discordia-space · Mar 8, 2024 · a4b65f3 · a4b65f3
1 parent f26fed0
commit a4b65f3
Show file tree

Hide file tree

Showing 82 changed files with 240 additions and 6,948 deletions.
diff --git a/cev_eris.dme b/cev_eris.dme
@@ -248,7 +248,6 @@
 #include "code\controllers\subsystems\spawn_data.dm"
 #include "code\controllers\subsystems\staverbs.dm"
 #include "code\controllers\subsystems\sun.dm"
-#include "code\controllers\subsystems\supply.dm"
 #include "code\controllers\subsystems\tgui.dm"
 #include "code\controllers\subsystems\throwing.dm"
 #include "code\controllers\subsystems\ticker.dm"
@@ -538,7 +537,6 @@
 #include "code\game\shuttle_engines.dm"
 #include "code\game\skincmd.dm"
 #include "code\game\sound.dm"
-#include "code\game\supplyshuttle.dm"
 #include "code\game\world.dm"
 #include "code\game\antagonist\_antagonist_setup.dm"
 #include "code\game\antagonist\antagonist.dm"
@@ -616,7 +614,6 @@
 #include "code\game\gamemodes\events\hidden_events\bluespace_rift.dm"
 #include "code\game\gamemodes\events\hidden_events\kaiser.dm"
 #include "code\game\gamemodes\events\holidays\Christmas.dm"
-#include "code\game\gamemodes\events\holidays\Holidays.dm"
 #include "code\game\gamemodes\events\weather\rad_storm.dm"
 #include "code\game\gamemodes\malfunction\malf_hardware.dm"
 #include "code\game\gamemodes\malfunction\malf_research.dm"
@@ -718,7 +715,6 @@
 #include "code\game\machinery\status_display.dm"
 #include "code\game\machinery\status_display_ai.dm"
 #include "code\game\machinery\suit_storage_unit.dm"
-#include "code\game\machinery\supply_display.dm"
 #include "code\game\machinery\supplybeacon.dm"
 #include "code\game\machinery\surveillance_pod.dm"
 #include "code\game\machinery\teleporter.dm"
@@ -811,7 +807,6 @@
 #include "code\game\objects\buckling.dm"
 #include "code\game\objects\empulse.dm"
 #include "code\game\objects\explosion.dm"
-#include "code\game\objects\explosion_recursive.dm"
 #include "code\game\objects\heatwave.dm"
 #include "code\game\objects\items.dm"
 #include "code\game\objects\objs.dm"
@@ -944,10 +939,6 @@
 #include "code\game\objects\items\devices\organ_module\active\multitool\miner.dm"
 #include "code\game\objects\items\devices\organ_module\passive\armor.dm"
 #include "code\game\objects\items\devices\organ_module\passive\muscle.dm"
-#include "code\game\objects\items\devices\PDA\cart.dm"
-#include "code\game\objects\items\devices\PDA\chatroom.dm"
-#include "code\game\objects\items\devices\PDA\PDA.dm"
-#include "code\game\objects\items\devices\PDA\radio.dm"
 #include "code\game\objects\items\devices\radio\beacon.dm"
 #include "code\game\objects\items\devices\radio\electropack.dm"
 #include "code\game\objects\items\devices\radio\encryptionkey.dm"
@@ -1491,22 +1482,6 @@
 #include "code\modules\bs_snare\circuits.dm"
 #include "code\modules\bs_snare\machinery.dm"
 #include "code\modules\bs_snare\snare.dm"
-#include "code\modules\cargo\exports.dm"
-#include "code\modules\cargo\order.dm"
-#include "code\modules\cargo\packs.dm"
-#include "code\modules\cargo\supplyshuttle.dm"
-#include "code\modules\cargo\exports\gear.dm"
-#include "code\modules\cargo\exports\large_objects.dm"
-#include "code\modules\cargo\exports\manifest.dm"
-#include "code\modules\cargo\exports\medical_shit.dm"
-#include "code\modules\cargo\exports\misc.dm"
-#include "code\modules\cargo\exports\money.dm"
-#include "code\modules\cargo\exports\parts.dm"
-#include "code\modules\cargo\exports\research.dm"
-#include "code\modules\cargo\exports\rnd_shit.dm"
-#include "code\modules\cargo\exports\sheets.dm"
-#include "code\modules\cargo\exports\tools.dm"
-#include "code\modules\cargo\exports\weapons.dm"
 #include "code\modules\client\client_defines.dm"
 #include "code\modules\client\client_procs.dm"
 #include "code\modules\client\darkmode.dm"
@@ -1850,6 +1825,7 @@
 #include "code\modules\mining\money_bag.dm"
 #include "code\modules\mining\ore.dm"
 #include "code\modules\mining\ore_datum.dm"
+#include "code\modules\mining\plasticflaps.dm"
 #include "code\modules\mining\satchel_ore_boxdm.dm"
 #include "code\modules\mining\drilling\cave_generator.dm"
 #include "code\modules\mining\drilling\cave_mineral.dm"
@@ -2362,7 +2338,6 @@
 #include "code\modules\overmap\ships\engines\thermal.dm"
 #include "code\modules\paperwork\carbonpaper.dm"
 #include "code\modules\paperwork\clipboard.dm"
-#include "code\modules\paperwork\faxmachine.dm"
 #include "code\modules\paperwork\filingcabinet.dm"
 #include "code\modules\paperwork\folders.dm"
 #include "code\modules\paperwork\handlabeler.dm"
@@ -2686,7 +2661,6 @@
 #include "code\modules\shuttles\shuttle_emergency.dm"
 #include "code\modules\shuttles\shuttle_ferry.dm"
 #include "code\modules\shuttles\shuttle_specops.dm"
-#include "code\modules\shuttles\shuttle_supply.dm"
 #include "code\modules\shuttles\shuttles_multi.dm"
 #include "code\modules\sprite_accessories\_accessory.dm"
 #include "code\modules\sprite_accessories\_accessory_facial.dm"

diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
@@ -116,9 +116,6 @@
 	if (config.log_adminwarn)
 		game_log("ADMINWARN", text)
 
-/proc/log_pda(text)
-	if (config.log_pda)
-		game_log("PDA", text)
 
 /**
  * Appends a tgui-related log entry. All arguments are optional.

diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
@@ -17,63 +17,6 @@ var/command_name
 /proc/system_name()
 	return "Nyx"
 
-/proc/station_name()
-	if (station_name)
-		return station_name
-
-	var/random = rand(1, 5)
-	var/name = ""
-
-	//Rare: Pre-Prefix
-	if (prob(10))
-		name = pick("Imperium", "Heretical", "Cuban", "Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique", "Houseruled", "Religious", "Atheist", "Traditional", "Houseruled", "Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental", "Augmented")
-		station_name = name + " "
-
-	// Prefix
-	switch(Holiday)
-		//get normal name
-		if(null, "", 0)
-			name = pick("", "Stanford", "Dorf", "Alium", "Prefix", "Clowning", "Aegis", "Ishimura", "Scaredy", "Death-World", "Mime", "Honk", "Rogue", "MacRagge", "Ultrameens", "Safety", "Paranoia", "Explosive", "Neckbear", "Donk", "Muppet", "North", "West", "East", "South", "Slant-ways", "Widdershins", "Rimward", "Expensive", "Procreatory", "Imperial", "Unidentified", "Immoral", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist", "Corrogated", "Skeleton", "Race", "Fatguy", "Gentleman", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Spess", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot", "Hats", "Pizza")
-			if(name)
-				station_name += name + " "
-
-		//For special days like christmas, easter, new-years etc ~Carn
-		if("Friday the 13th")
-			name = pick("Mike", "Friday", "Evil", "Myers", "Murder", "Deathly", "Stabby")
-			station_name += name + " "
-			random = 13
-		else
-			//get the first word of the Holiday and use that
-			var/i = findtext(Holiday, " ", 1, 0)
-			name = copytext(Holiday, 1, i)
-			station_name += name + " "
-
-	// Suffix
-	name = pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard", "Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp")
-	station_name += name + " "
-
-	// ID Number
-	switch(random)
-		if(1)
-			station_name += "[rand(1, 99)]"
-		if(2)
-			station_name += pick("Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi", "Chi", "Psi", "Omega")
-		if(3)
-			station_name += pick("II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV", "XV", "XVI", "XVII", "XVIII", "XIX", "XX")
-		if(4)
-			station_name += pick("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu")
-		if(5)
-			station_name += pick("One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen")
-		if(13)
-			station_name += pick("13", "XIII", "Thirteen")
-
-
-	if (config && config.server_name)
-		world.name = "[config.server_name]: [name]"
-	else
-		world.name = station_name
-
-	return station_name
 
 /proc/world_name(var/name)
 

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
@@ -538,9 +538,6 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
 				if("popup_admin_pm")
 					config.popup_admin_pm = 1
 
-				if("allow_holidays")
-					Holiday = 1
-
 				if("use_irc_bot")
 					use_irc_bot = 1
 
@@ -852,7 +849,7 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
 		else //probably windows, if not this should work anyway
 			config.python_path = "python"
 
-	world.name = station_name()
+	world.name = station_name
 
 
 /datum/configuration/proc/LoadChatFilter()

diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm