From e60b9706b5b860e08ea3e2c1b1e9b824ca1db3cc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 11 Sep 2020 23:15:33 +0200
Subject: [PATCH] [MIRROR] Remove references to old singularity machines (#744)

* Remove references to old singularity machines (#53509)

Removes the singularity generator and the particle accelerator. The former had no sprite, and the latter only existed because of a leftover type path. This does not affect gameplay at all.

Removes the "Start Singularity" verb that was only intended for debug use.

Fixes #53508.

* Remove references to old singularity machines

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
---
 .../lavaland_surface_ash_walker1.dmm          |  1 -
 code/modules/admin/admin_verbs.dm             |  1 -
 code/modules/admin/verbs/debug.dm             | 58 -------------------
 code/modules/admin/verbs/mapping.dm           |  1 -
 .../mob/living/simple_animal/parrot.dm        | 18 ++++--
 code/modules/power/singularity/generator.dm   | 35 -----------
 code/modules/swarmers/swarmer_act.dm          |  4 --
 tgstation.dme                                 |  1 -
 8 files changed, 12 insertions(+), 107 deletions(-)
 delete mode 100644 code/modules/power/singularity/generator.dm

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index bb84e6b37f9..5d42d955483 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -606,7 +606,6 @@
 /obj/structure/stone_tile/cracked{
 	dir = 8
 	},
-/obj/machinery/the_singularitygen,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "bA" = (
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 660b0374365..864bcfa3886 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -238,7 +238,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/client/proc/Debug2,
 	/client/proc/reload_admins,
 	/client/proc/cmd_debug_make_powernets,
-	/client/proc/startSinglo,
 	/client/proc/cmd_debug_mob_lists,
 	/client/proc/cmd_debug_del_all,
 	/client/proc/enable_debug_verbs,
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 9d90c473911..518d209f908 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -579,64 +579,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 	return dresscode
 
-/client/proc/startSinglo()
-
-	set category = "Debug"
-	set name = "Start Singularity"
-	set desc = "Sets up the singularity and all machines to get power flowing through the station"
-
-	if(alert("Are you sure? This will start up the engine. Should only be used during debug!",,"Yes","No") != "Yes")
-		return
-
-	for(var/obj/machinery/power/emitter/E in GLOB.machines)
-		if(E.anchored)
-			E.active = TRUE
-
-	for(var/obj/machinery/field/generator/F in GLOB.machines)
-		if(F.active == FALSE)
-			F.set_anchored(TRUE)
-			F.active = TRUE
-			F.state = 2
-			F.power = 250
-			F.warming_up = 3
-			F.start_fields()
-			F.update_icon()
-
-	spawn(30)
-		for(var/obj/machinery/the_singularitygen/G in GLOB.machines)
-			if(G.anchored)
-				var/obj/singularity/S = new /obj/singularity(get_turf(G), 50)
-//				qdel(G)
-				S.energy = 1750
-				S.current_size = 7
-				S.icon = 'icons/effects/224x224.dmi'
-				S.icon_state = "singularity_s7"
-				S.pixel_x = -96
-				S.pixel_y = -96
-				S.grav_pull = 0
-				//S.consume_range = 3
-				S.dissipate = 0
-				//S.dissipate_delay = 10
-				//S.dissipate_track = 0
-				//S.dissipate_strength = 10
-
-	for(var/obj/machinery/power/rad_collector/Rad in GLOB.machines)
-		if(Rad.anchored)
-			if(!Rad.loaded_tank)
-				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
-				Plasma.air_contents.assert_gas(/datum/gas/plasma)
-				Plasma.air_contents.gases[/datum/gas/plasma][MOLES] = 70
-				Rad.drainratio = 0
-				Rad.loaded_tank = Plasma
-				Plasma.forceMove(Rad)
-
-			if(!Rad.active)
-				Rad.toggle_power()
-
-	for(var/obj/machinery/power/smes/SMES in GLOB.machines)
-		if(SMES.anchored)
-			SMES.input_attempt = 1
-
 /client/proc/cmd_debug_mob_lists()
 	set category = "Debug"
 	set name = "Debug Mob Lists"
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 843e53ee386..58747b63165 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -31,7 +31,6 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/count_objects_all,
 	/client/proc/cmd_assume_direct_control,	//-errorage
 	/client/proc/cmd_give_direct_control,
-	/client/proc/startSinglo,
 	/client/proc/set_server_fps,	//allows you to set the ticklag.
 	/client/proc/cmd_admin_grantfullaccess,
 	/client/proc/cmd_admin_areatest_all,
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 310125df08a..3583968de77 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -91,12 +91,18 @@
 	//Parrots will generally sit on their perch unless something catches their eye.
 	//These vars store their preffered perch and if they dont have one, what they can use as a perch
 	var/obj/parrot_perch = null
-	var/obj/desired_perches = list(/obj/structure/frame/computer, 		/obj/structure/displaycase, \
-									/obj/structure/filingcabinet,		/obj/machinery/teleport, \
-									/obj/machinery/dna_scannernew,		/obj/machinery/telecomms, \
-									/obj/machinery/nuclearbomb,			/obj/machinery/particle_accelerator, \
-									/obj/machinery/recharge_station,	/obj/machinery/smartfridge, \
-									/obj/machinery/computer,			/obj/machinery/suit_storage_unit)
+	var/obj/desired_perches = list(/obj/structure/frame/computer,
+		/obj/structure/displaycase,
+		/obj/structure/filingcabinet,
+		/obj/machinery/teleport,
+		/obj/machinery/dna_scannernew,
+		/obj/machinery/telecomms,
+		/obj/machinery/nuclearbomb,
+		/obj/machinery/recharge_station,
+		/obj/machinery/smartfridge,
+		/obj/machinery/computer,
+		/obj/machinery/suit_storage_unit,
+	)
 
 	//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
 	var/obj/item/held_item = null
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
deleted file mode 100644
index e54c48203e9..00000000000
--- a/code/modules/power/singularity/generator.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-/////SINGULARITY SPAWNER
-/obj/machinery/the_singularitygen
-	name = "Gravitational Singularity Generator"
-	desc = "An odd device which produces a Gravitational Singularity when set up."
-	icon = 'icons/obj/singularity.dmi'
-	icon_state = "TheSingGen"
-	anchored = FALSE
-	density = TRUE
-	use_power = NO_POWER_USE
-	resistance_flags = FIRE_PROOF
-
-	// You can buckle someone to the singularity generator, then start the engine. Fun!
-	can_buckle = TRUE
-	buckle_lying = 0
-	buckle_requires_restraints = TRUE
-
-	var/energy = 0
-	var/creation_type = /obj/singularity
-
-/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user, params)
-	if(W.tool_behaviour == TOOL_WRENCH)
-		default_unfasten_wrench(user, W, 0)
-	else
-		return ..()
-
-/obj/machinery/the_singularitygen/process(delta_time)
-	if(energy > 0)
-		if(energy >= 200)
-			var/turf/T = get_turf(src)
-			SSblackbox.record_feedback("tally", "engine_started", 1, type)
-			var/obj/singularity/S = new creation_type(T, 50)
-			transfer_fingerprints_to(S)
-			qdel(src)
-		else
-			energy -= delta_time * 0.5
diff --git a/code/modules/swarmers/swarmer_act.dm b/code/modules/swarmers/swarmer_act.dm
index 8db93146619..95d2dba1a67 100644
--- a/code/modules/swarmers/swarmer_act.dm
+++ b/code/modules/swarmers/swarmer_act.dm
@@ -134,10 +134,6 @@
 		toggle_cam(actor, FALSE)
 	return TRUE
 
-/obj/machinery/particle_accelerator/control_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
-	actor.dis_integrate(src)
-	return TRUE
-
 /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
 	actor.dis_integrate(src)
 	return TRUE
diff --git a/tgstation.dme b/tgstation.dme
index bb61210249f..2b71a6a29ca 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2672,7 +2672,6 @@
 #include "code\modules\power\singularity\containment_field.dm"
 #include "code\modules\power\singularity\emitter.dm"
 #include "code\modules\power\singularity\field_generator.dm"
-#include "code\modules\power\singularity\generator.dm"
 #include "code\modules\power\singularity\investigate.dm"
 #include "code\modules\power\singularity\narsie.dm"
 #include "code\modules\power\singularity\singularity.dm"