Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
@@ -40,7 +40,7 @@

 /obj/machinery/am_shielding/proc/collapse()
 	visible_message("<span class='notice'>[src] collapses back into a container!</span>")
-	new /obj/item/device/am_shielding_container(drop_location())
+	new /obj/item/am_shielding_container(drop_location())
 	qdel(src)

 /obj/machinery/am_shielding/proc/controllerscan(priorscan = 0)
@@ -231,7 +231,7 @@



-/obj/item/device/am_shielding_container
+/obj/item/am_shielding_container
 	name = "packaged antimatter reactor section"
 	desc = "A small storage unit containing an antimatter reactor section.  To use place near an antimatter control unit or deployed antimatter reactor section and use a multitool to activate this package."
 	icon = 'icons/obj/machines/antimatter.dmi'
@@ -246,8 +246,8 @@
 	throw_range = 2
 	materials = list(MAT_METAL=100)

-/obj/item/device/am_shielding_container/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/multitool) && istype(src.loc, /turf))
+/obj/item/am_shielding_container/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/multitool) && istype(src.loc, /turf))
 		new/obj/machinery/am_shielding(src.loc)
 		qdel(src)
 	else
@@ -26,6 +26,13 @@
 #define APC_UPOVERLAY_LOCKED		(1<<12)
 #define APC_UPOVERLAY_OPERATING		(1<<13)

+#define APC_ELECTRONICS_MISSING 0 // None
+#define APC_ELECTRONICS_INSTALLED 1 // Installed but not secured
+#define APC_ELECTRONICS_SECURED 2 // Installed and secured
+
+#define APC_COVER_CLOSED 0
+#define APC_COVER_OPENED 1
+#define APC_COVER_REMOVED 2

 // the Area Power Controller (APC), formerly Power Distribution Unit (PDU)
 // one per area, needs wire connection to power network through a terminal
@@ -34,13 +41,9 @@
 // may be opened to change power cell
 // three different channels (lighting/equipment/environ) - may each be set to on, off, or auto

-
-//NOTE: STUFF STOLEN FROM AIRLOCK.DM thx
-
-
 /obj/machinery/power/apc
 	name = "area power controller"
-	desc = "A control terminal for the area electrical systems."
+	desc = "A control terminal for the area's electrical systems."

 	icon_state = "apc0"
 	anchored = TRUE
@@ -57,7 +60,7 @@
 	var/obj/item/stock_parts/cell/cell
 	var/start_charge = 90				// initial cell charge %
 	var/cell_type = /obj/item/stock_parts/cell/upgraded		//Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs
-	var/opened = 0 //0=closed, 1=opened, 2=cover removed
+	var/opened = APC_COVER_CLOSED
 	var/shorted = 0
 	var/lighting = 3
 	var/equipment = 3
@@ -79,7 +82,7 @@
 	powernet = 0		// set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :(
 	var/malfhack = 0 //New var for my changes to AI malf. --NeoFite
 	var/mob/living/silicon/ai/malfai = null //See above --NeoFite
-	var/has_electronics = 0 // 0 - none, 1 - plugged in, 2 - secured by screwdriver
+	var/has_electronics = APC_ELECTRONICS_MISSING // 0 - none, 1 - plugged in, 2 - secured by screwdriver
 	var/overload = 1 //used for the Blackout malf module
 	var/beenhit = 0 // used for counting how many times it has been hit, used for Aliens at the moment
 	var/mob/living/silicon/ai/occupier = null
@@ -147,7 +150,7 @@
 			pixel_x = -25
 	if (building)
 		area = get_area(src)
-		opened = 1
+		opened = APC_COVER_OPENED
 		operating = FALSE
 		name = "[area.name] APC"
 		stat |= MAINT
@@ -190,7 +193,7 @@
 	. = ..()
 	if(!mapload)
 		return
-	has_electronics = 2 //installed and secured
+	has_electronics = APC_ELECTRONICS_SECURED
 	// is starting with a power cell installed, create it and set its charge level
 	if(cell_type)
 		cell = new cell_type
@@ -218,7 +221,7 @@
 		return
 	if(opened)
 		if(has_electronics && terminal)
-			to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
+			to_chat(user, "The cover is [opened==APC_COVER_REMOVED?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
 		else
 			to_chat(user, "It's [ !terminal ? "not" : "" ] wired up.")
 			to_chat(user, "The electronics are[!has_electronics?"n't":""] installed.")
@@ -316,9 +319,9 @@
 	if(stat & MAINT)
 		update_state |= UPSTATE_MAINT
 	if(opened)
-		if(opened==1)
+		if(opened==APC_COVER_OPENED)
 			update_state |= UPSTATE_OPENED1
-		if(opened==2)
+		if(opened==APC_COVER_REMOVED)
 			update_state |= UPSTATE_OPENED2
 	else if((obj_flags & EMAGGED) || malfai)
 		update_state |= UPSTATE_BLUESCREEN
@@ -378,75 +381,142 @@

 //attack with an item - open/close cover, insert cell, or (un)lock interface

+/obj/machinery/power/apc/crowbar_act(mob/user, obj/item/W)
+	. = TRUE
+	if (opened)
+		if(cell)
+			user.visible_message("[user] removes \the [cell] from [src]!","<span class='notice'>You remove \the [cell].</span>")
+			var/turf/T = get_turf(user)
+			cell.forceMove(T)
+			cell.update_icon()
+			cell = null
+			charging = 0
+			update_icon()
+			return
+		if (has_electronics == APC_ELECTRONICS_INSTALLED)
+			if (terminal)
+				to_chat(user, "<span class='warning'>Disconnect the wires first!</span>")
+				return
+			W.play_tool_sound(src)
+			to_chat(user, "<span class='notice'>You attempt to remove the power control board...</span>" )
+			if(W.use_tool(src, user, 50))
+				if (has_electronics == APC_ELECTRONICS_INSTALLED)
+					has_electronics = APC_ELECTRONICS_MISSING
+					if (stat & BROKEN)
+						user.visible_message(\
+							"[user.name] has broken the power control board inside [src.name]!",\
+							"<span class='notice'>You break the charred power control board and remove the remains.</span>",
+							"<span class='italics'>You hear a crack.</span>")
+						return
+					else if (obj_flags & EMAGGED)
+						obj_flags &= ~EMAGGED
+						user.visible_message(\
+							"[user.name] has discarded an emagged power control board from [src.name]!",\
+							"<span class='notice'>You discard the emagged power control board.</span>")
+						return
+					else if (malfhack)
+						user.visible_message(\
+							"[user.name] has discarded a strangely programmed power control board from [src.name]!",\
+							"<span class='notice'>You discard the strangely programmed board.</span>")
+						malfai = null
+						malfhack = 0
+						return
+					else
+						user.visible_message(\
+							"[user.name] has removed the power control board from [src.name]!",\
+							"<span class='notice'>You remove the power control board.</span>")
+						new /obj/item/electronics/apc(loc)
+						return
+		else if(integration_cog)
+			user.visible_message("<span class='notice'>[user] starts prying [integration_cog] from [src]...</span>", \
+			"<span class='notice'>You painstakingly start tearing [integration_cog] out of [src]'s guts...</span>")
+			W.play_tool_sound(src)
+			if(W.use_tool(src, user, 100))
+				user.visible_message("<span class='notice'>[user] destroys [integration_cog] in [src]!</span>", \
+				"<span class='notice'>[integration_cog] comes free with a clank and snaps in two as the machinery returns to normal!</span>")
+				playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
+				QDEL_NULL(integration_cog)
+			return
+		else if (opened!=APC_COVER_REMOVED)
+			opened = APC_COVER_CLOSED
+			coverlocked = TRUE //closing cover relocks it
+			update_icon()
+			return
+	else if (!(stat & BROKEN))
+		if(coverlocked && !(stat & MAINT)) // locked...
+			to_chat(user, "<span class='warning'>The cover is locked and cannot be opened!</span>")
+			return
+		else if (panel_open)
+			to_chat(user, "<span class='warning'>Exposed wires prevents you from opening it!</span>")
+			return
+		else
+			opened = APC_COVER_OPENED
+			update_icon()
+			return
+
+/obj/machinery/power/apc/screwdriver_act(mob/living/user, obj/item/W)
+	. = TRUE
+	if(opened)
+		if (cell)
+			to_chat(user, "<span class='warning'>Close the APC first!</span>")
+			return
+		else
+			switch (has_electronics)
+				if (APC_ELECTRONICS_INSTALLED)
+					has_electronics = APC_ELECTRONICS_SECURED
+					stat &= ~MAINT
+					W.play_tool_sound(src)
+					to_chat(user, "<span class='notice'>You screw the circuit electronics into place.</span>")
+				if (APC_ELECTRONICS_SECURED)
+					has_electronics = APC_ELECTRONICS_INSTALLED
+					stat |= MAINT
+					W.play_tool_sound(src)
+					to_chat(user, "<span class='notice'>You unfasten the electronics.</span>")
+				else
+					to_chat(user, "<span class='warning'>There is nothing to secure!</span>")
+					return
+			update_icon()
+	else if(obj_flags & EMAGGED)
+		to_chat(user, "<span class='warning'>The interface is broken!</span>")
+		return
+	else
+		panel_open = !panel_open
+		to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"]")
+		update_icon()
+
+/obj/machinery/power/apc/wirecutter_act(mob/living/user, obj/item/W)
+	if (terminal && opened)
+		terminal.dismantle(user, W)
+		return TRUE
+
+
+/obj/machinery/power/apc/welder_act(mob/living/user, obj/item/W)
+	if (opened && !has_electronics && !terminal)
+		if(!W.tool_start_check(user, amount=3))
+			return
+		user.visible_message("[user.name] welds [src].", \
+							"<span class='notice'>You start welding the APC frame...</span>", \
+							"<span class='italics'>You hear welding.</span>")
+		if(W.use_tool(src, user, 50, volume=50, amount=3))
+			if ((stat & BROKEN) || opened==APC_COVER_REMOVED)
+				new /obj/item/stack/sheet/metal(loc)
+				user.visible_message(\
+					"[user.name] has cut [src] apart with [W].",\
+					"<span class='notice'>You disassembled the broken APC frame.</span>")
+			else
+				new /obj/item/wallframe/apc(loc)
+				user.visible_message(\
+					"[user.name] has cut [src] from the wall with [W].",\
+					"<span class='notice'>You cut the APC frame from the wall.</span>")
+			qdel(src)
+			return TRUE
+
 /obj/machinery/power/apc/attackby(obj/item/W, mob/living/user, params)

 	if(issilicon(user) && get_dist(src,user)>1)
 		return attack_hand(user)
-	if (istype(W, /obj/item/crowbar)) //Using crowbar
-		if (opened) // a) on open apc
-			if (has_electronics==1)
-				if (terminal)
-					to_chat(user, "<span class='warning'>Disconnect the wires first!</span>")
-					return
-				W.play_tool_sound(src)
-				to_chat(user, "<span class='notice'>You are trying to remove the power control board...</span>" )
-				if(W.use_tool(src, user, 50))
-					if (has_electronics==1)
-						has_electronics = 0
-						if (stat & BROKEN)
-							user.visible_message(\
-								"[user.name] has broken the power control board inside [src.name]!",\
-								"<span class='notice'>You break the charred power control board and remove the remains.</span>",
-								"<span class='italics'>You hear a crack.</span>")
-							return
-							//SSticker.mode:apcs-- //XSI said no and I agreed. -rastaf0
-						else if (obj_flags & EMAGGED) // We emag board, not APC's frame
-							obj_flags &= ~EMAGGED
-							user.visible_message(\
-								"[user.name] has discarded emaged power control board from [src.name]!",\
-								"<span class='notice'>You discarded shorten board.</span>")
-							return
-						else if (malfhack) // AI hacks board, not APC's frame
-							user.visible_message(\
-								"[user.name] has discarded strangely programmed power control board from [src.name]!",\
-								"<span class='notice'>You discarded strangely programmed board.</span>")
-							malfai = null
-							malfhack = 0
-							return
-						else
-							user.visible_message(\
-								"[user.name] has removed the power control board from [src.name]!",\
-								"<span class='notice'>You remove the power control board.</span>")
-							new /obj/item/electronics/apc(loc)
-							return
-			else if(integration_cog)
-				user.visible_message("<span class='notice'>[user] starts prying [integration_cog] from [src]...</span>", \
-				"<span class='notice'>You painstakingly start tearing [integration_cog] out of [src]'s guts...</span>")
-				W.play_tool_sound(src)
-				if(W.use_tool(src, user, 100))
-					user.visible_message("<span class='notice'>[user] destroys [integration_cog] in [src]!</span>", \
-					"<span class='notice'>[integration_cog] comes free with a clank and snaps in two as the machinery returns to normal!</span>")
-					playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
-					QDEL_NULL(integration_cog)
-				return
-			else if (opened!=2) //cover isn't removed
-				opened = 0
-				coverlocked = TRUE //closing cover relocks it
-				update_icon()
-				return
-		else if (!(stat & BROKEN)) // b) on closed and not broken APC
-			if(coverlocked && !(stat & MAINT)) // locked...
-				to_chat(user, "<span class='warning'>The cover is locked and cannot be opened!</span>")
-				return
-			else if (panel_open) // wires are exposed
-				to_chat(user, "<span class='warning'>Exposed wires prevents you from opening it!</span>")
-				return
-			else
-				opened = 1
-				update_icon()
-				return

-	else if	(istype(W, /obj/item/stock_parts/cell) && opened)	// trying to put a cell inside
+	if	(istype(W, /obj/item/stock_parts/cell) && opened)
 		if(cell)
 			to_chat(user, "<span class='warning'>There is a power cell already installed!</span>")
 			return
@@ -462,39 +532,8 @@
 				"<span class='notice'>You insert the power cell.</span>")
 			chargecount = 0
 			update_icon()
-
-	else if	(istype(W, /obj/item/screwdriver))	// haxing
-		if(opened)
-			if (cell)
-				to_chat(user, "<span class='warning'>Close the APC first!</span>") //Less hints more mystery!
-				return
-			else
-				if (has_electronics==1)
-					has_electronics = 2
-					stat &= ~MAINT
-					W.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You screw the circuit electronics into place.</span>")
-				else if (has_electronics==2)
-					has_electronics = 1
-					stat |= MAINT
-					W.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You unfasten the electronics.</span>")
-				else /* has_electronics==0 */
-					to_chat(user, "<span class='warning'>There is nothing to secure!</span>")
-					return
-				update_icon()
-		else if(obj_flags & EMAGGED)
-			to_chat(user, "<span class='warning'>The interface is broken!</span>")
-		else if((stat & MAINT) && !opened)
-			..() //its an empty closed frame... theres no wires to expose!
-		else
-			panel_open = !panel_open
-			to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"]")
-			update_icon()
-
-	else if (W.GetID())			// trying to unlock the interface with an ID card
+	else if (W.GetID())
 		togglelock(user)
-
 	else if (istype(W, /obj/item/stack/cable_coil) && opened)
 		var/turf/host_turf = get_turf(src)
 		if(!host_turf)
@@ -503,10 +542,10 @@
 		if (host_turf.intact)
 			to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first!</span>")
 			return
-		else if (terminal) // it already have terminal
+		else if (terminal)
 			to_chat(user, "<span class='warning'>This APC is already wired!</span>")
 			return
-		else if (has_electronics == 0)
+		else if (!has_electronics)
 			to_chat(user, "<span class='warning'>There is nothing to wire!</span>")
 			return

@@ -520,7 +559,7 @@
 		if(do_after(user, 20, target = src))
 			if (C.get_amount() < 10 || !C)
 				return
-			if (C.get_amount() >= 10 && !terminal && opened && has_electronics > 0)
+			if (C.get_amount() >= 10 && !terminal && opened && has_electronics)
 				var/turf/T = get_turf(src)
 				var/obj/structure/cable/N = T.get_cable_node()
 				if (prob(50) && electrocute_mob(usr, N, N, 1, TRUE))
@@ -530,13 +569,9 @@
 				to_chat(user, "<span class='notice'>You add cables to the APC frame.</span>")
 				make_terminal()
 				terminal.connect_to_network()
-
-	else if (istype(W, /obj/item/wirecutters) && terminal && opened)
-		terminal.dismantle(user, W)
-
 	else if (istype(W, /obj/item/electronics/apc) && opened)
-		if (has_electronics!=0) // there are already electronicks inside
-			to_chat(user, "<span class='warning'>You cannot put the board inside, there already is one!</span>")
+		if (has_electronics)
+			to_chat(user, "<span class='warning'>There is already a board inside the [src]!</span>")
 			return
 		else if (stat & BROKEN)
 			to_chat(user, "<span class='warning'>You cannot put the board inside, the frame is damaged!</span>")
@@ -546,14 +581,13 @@
 							"<span class='notice'>You start to insert the power control board into the frame...</span>")
 		playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
 		if(do_after(user, 10, target = src))
-			if(has_electronics==0)
-				has_electronics = 1
+			if(!has_electronics)
+				has_electronics = APC_ELECTRONICS_INSTALLED
 				locked = FALSE
 				to_chat(user, "<span class='notice'>You place the power control board inside the frame.</span>")
 				qdel(W)
-
-	else if(istype(W, /obj/item/device/electroadaptive_pseudocircuit) && opened)
-		var/obj/item/device/electroadaptive_pseudocircuit/P = W
+	else if(istype(W, /obj/item/electroadaptive_pseudocircuit) && opened)
+		var/obj/item/electroadaptive_pseudocircuit/P = W
 		if(!has_electronics)
 			if(stat & BROKEN)
 				to_chat(user, "<span class='warning'>[src]'s frame is too damaged to support a circuit.</span>")
@@ -562,7 +596,7 @@
 				return
 			user.visible_message("<span class='notice'>[user] fabricates a circuit and places it into [src].</span>", \
 			"<span class='notice'>You adapt a power control board and click it into place in [src]'s guts.</span>")
-			has_electronics = TRUE
+			has_electronics = APC_ELECTRONICS_INSTALLED
 			locked = FALSE
 		else if(!cell)
 			if(stat & MAINT)
@@ -580,38 +614,17 @@
 		else
 			to_chat(user, "<span class='warning'>[src] has both electronics and a cell.</span>")
 			return
-
-	else if (istype(W, /obj/item/weldingtool) && opened && has_electronics==0 && !terminal)
-		if(!W.tool_start_check(user, amount=3))
-			return
-		user.visible_message("[user.name] welds [src].", \
-							"<span class='notice'>You start welding the APC frame...</span>", \
-							"<span class='italics'>You hear welding.</span>")
-		if(W.use_tool(src, user, 50, volume=50, amount=3))
-			if ((stat & BROKEN) || opened==2)
-				new /obj/item/stack/sheet/metal(loc)
-				user.visible_message(\
-					"[user.name] has cut [src] apart with [W].",\
-					"<span class='notice'>You disassembled the broken APC frame.</span>")
-			else
-				new /obj/item/wallframe/apc(loc)
-				user.visible_message(\
-					"[user.name] has cut [src] from the wall with [W].",\
-					"<span class='notice'>You cut the APC frame from the wall.</span>")
-			qdel(src)
-			return
-
 	else if (istype(W, /obj/item/wallframe/apc) && opened)
-		if (!(stat & BROKEN || opened==2 || obj_integrity < max_integrity)) // There is nothing to repair
+		if (!(stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair
 			to_chat(user, "<span class='warning'>You found no reason for repairing this APC</span>")
 			return
-		if (!(stat & BROKEN) && opened==2) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover
+		if (!(stat & BROKEN) && opened==APC_COVER_REMOVED) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover
 			user.visible_message("[user.name] replaces missing APC's cover.",\
 							"<span class='notice'>You begin to replace APC's cover...</span>")
 			if(do_after(user, 20, target = src)) // replacing cover is quicker than replacing whole frame
 				to_chat(user, "<span class='notice'>You replace missing APC's cover.</span>")
 				qdel(W)
-				opened = 1
+				opened = APC_COVER_OPENED
 				update_icon()
 			return
 		if (has_electronics)
@@ -624,8 +637,8 @@
 			qdel(W)
 			stat &= ~BROKEN
 			obj_integrity = max_integrity
-			if (opened==2)
-				opened = 1
+			if (opened==APC_COVER_REMOVED)
+				opened = APC_COVER_OPENED
 			update_icon()
 	else if(istype(W, /obj/item/clockwork/integration_cog) && is_servant_of_ratvar(user))
 		if(integration_cog)
@@ -634,7 +647,7 @@
 		if(!opened)
 			user.visible_message("<span class='warning'>[user] slices [src]'s cover lock, and it swings wide open!</span>", \
 			"<span class='alloy'>You slice [src]'s cover lock apart with [W], and the cover swings open.</span>")
-			opened = TRUE
+			opened = APC_COVER_OPENED
 			update_icon()
 		else
 			user.visible_message("<span class='warning'>[user] presses [W] into [src]!</span>", \
@@ -650,7 +663,7 @@
 			integration_cog = W
 			START_PROCESSING(SSfastprocess, W)
 			playsound(src, 'sound/machines/clockcult/steam_whoosh.ogg', 50, FALSE)
-			opened = FALSE
+			opened = APC_COVER_CLOSED
 			locked = FALSE
 			update_icon()
 		return
@@ -697,8 +710,9 @@
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(stat & BROKEN))
 			set_broken()
-		if(opened != 2)
-			opened = 2
+		if(opened != APC_COVER_REMOVED)
+			opened = APC_COVER_REMOVED
+			coverlocked = FALSE
 			visible_message("<span class='warning'>The APC cover is knocked down!</span>")
 			update_icon()

@@ -718,15 +732,14 @@
 			to_chat(user, "<span class='notice'>You emag the APC interface.</span>")
 			update_icon()

+
 // attack with hand - remove cell (if cover open) or interact with the APC

 /obj/machinery/power/apc/attack_hand(mob/user)
 	. = ..()
 	if(.)
 		return
-	if(!user)
-		return
-	if(usr == user && opened && (!issilicon(user)))
+	if(opened && (!issilicon(user)))
 		if(cell)
 			user.visible_message("[user] removes \the [cell] from [src]!","<span class='notice'>You remove \the [cell].</span>")
 			user.put_in_hands(cell)
@@ -988,7 +1001,7 @@
 				P.switch_mode_to(TRACK_NUKE_DISK) //Pinpointers go back to tracking the nuke disk
 				P.alert = FALSE

-/obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
+/obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
 	if(card.AI)
 		to_chat(user, "<span class='warning'>[card] is already occupied!</span>")
 		return
@@ -1337,6 +1350,14 @@

 #undef APC_RESET_EMP

+#undef APC_ELECTRONICS_MISSING
+#undef APC_ELECTRONICS_INSTALLED
+#undef APC_ELECTRONICS_SECURED
+
+#undef APC_COVER_CLOSED
+#undef APC_COVER_OPENED
+#undef APC_COVER_REMOVED
+
 //update_overlay
 #undef APC_UPOVERLAY_CHARGEING0
 #undef APC_UPOVERLAY_CHARGEING1
@@ -157,7 +157,7 @@ By design, d1 is the smallest direction and d2 is the highest
 			R.loaded.cable_join(src, user)
 			R.is_empty(user)

-	else if(istype(W, /obj/item/device/multitool))
+	else if(istype(W, /obj/item/multitool))
 		if(powernet && (powernet.avail > 0))		// is it powered?
 			to_chat(user, "<span class='danger'>[DisplayPower(powernet.avail)] in power network.</span>")
 		else
@@ -397,8 +397,8 @@
 /obj/machinery/light/attackby(obj/item/W, mob/living/user, params)

 	//Light replacer code
-	if(istype(W, /obj/item/device/lightreplacer))
-		var/obj/item/device/lightreplacer/LR = W
+	if(istype(W, /obj/item/lightreplacer))
+		var/obj/item/lightreplacer/LR = W
 		LR.ReplaceLight(src, user)

 	// attempt to insert light
@@ -173,9 +173,6 @@
 		return
 	else if(!active)

-		if(exchange_parts(user, O))
-			return
-
 		if(istype(O, /obj/item/wrench))

 			if(!anchored && !isinspace())
@@ -38,9 +38,7 @@
 	power_gen = initial(power_gen) * part_level

 /obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params)
-	if(exchange_parts(user, I))
-		return
-	else if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I))
+	if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I))
 		return
 	else if(default_deconstruction_crowbar(I))
 		return
@@ -104,7 +104,7 @@
 			disconnect_from_network()

 /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/device/analyzer) && loaded_tank)
+	if(istype(W, /obj/item/analyzer) && loaded_tank)
 		atmosanalyzer_scan(loaded_tank.air_contents, user)
 	else if(istype(W, /obj/item/tank/internals/plasma))
 		if(!anchored)
@@ -113,7 +113,7 @@
 		if(loaded_tank)
 			to_chat(user, "<span class='warning'>There's already a plasma tank loaded!</span>")
 			return TRUE
-		if(panel_open) 
+		if(panel_open)
 			to_chat(user, "<span class='warning'>Close the maintenance panel first!</span>")
 			return TRUE
 		if(!user.transferItemToLoc(W, src))
@@ -134,7 +134,7 @@
 		return ..()

 /obj/machinery/power/rad_collector/wrench_act(mob/living/user, obj/item/I)
-	default_unfasten_wrench(user, I, 0)
+	default_unfasten_wrench(user, I)
 	return TRUE

 /obj/machinery/power/rad_collector/screwdriver_act(mob/living/user, obj/item/I)
@@ -229,7 +229,7 @@
 			state = EM_UNSECURED

 /obj/machinery/power/emitter/wrench_act(mob/living/user, obj/item/I)
-	default_unfasten_wrench(user, I, 0)
+	default_unfasten_wrench(user, I)
 	return TRUE

 /obj/machinery/power/emitter/welder_act(mob/living/user, obj/item/I)
@@ -291,9 +291,6 @@
 		wires.interact(user)
 		return

-	else if(exchange_parts(user, I))
-		return
-
 	return ..()

 /obj/machinery/power/emitter/emag_act(mob/user)
@@ -106,7 +106,7 @@ field_generator power level display
 			state = FG_UNSECURED

 /obj/machinery/field/generator/wrench_act(mob/living/user, obj/item/I)
-	default_unfasten_wrench(user, I, 0)
+	default_unfasten_wrench(user, I)
 	return TRUE

 /obj/machinery/field/generator/welder_act(mob/living/user, obj/item/I)
@@ -91,7 +91,10 @@
 	SSticker.force_ending = 1

 /proc/cult_ending_helper(var/no_explosion = 0)
-	Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,.ending_helper))
+	if(no_explosion)
+		Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
+	else
+		Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))

 //ATTACK GHOST IGNORING PARENT RETURN VALUE
 /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
@@ -98,10 +98,6 @@
 		update_icon()
 		return

-	//exchanging parts using the RPE
-	if(exchange_parts(user, I))
-		return
-
 	//building and linking a terminal
 	if(istype(I, /obj/item/stack/cable_coil))
 		var/dir = get_dir(user,src)
@@ -123,8 +123,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	//How much hallucination should it produce per unit of power?
 	var/config_hallucination_power = 0.1

-	var/obj/item/device/radio/radio
-	var/radio_key = /obj/item/device/encryptionkey/headset_eng
+	var/obj/item/radio/radio
+	var/radio_key = /obj/item/encryptionkey/headset_eng
 	var/engineering_channel = "Engineering"
 	var/common_channel = null

@@ -234,6 +234,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	return integrity

 /obj/machinery/power/supermatter_crystal/proc/countdown()
+	set waitfor = FALSE
+
 	if(final_countdown) // We're already doing it go away
 		return
 	final_countdown = TRUE
@@ -56,9 +56,6 @@
 	if(default_deconstruction_screwdriver(user, "coil_open[anchored]", "coil[anchored]", W))
 		return

-	if(exchange_parts(user, W))
-		return
-
 	if(default_unfasten_wrench(user, W))
 		return

@@ -169,9 +166,6 @@
 	if(default_deconstruction_screwdriver(user, "grounding_rod_open[anchored]", "grounding_rod[anchored]", W))
 		return

-	if(exchange_parts(user, W))
-		return
-
 	if(default_unfasten_wrench(user, W))
 		return

@@ -112,9 +112,6 @@
 			stat |= BROKEN
 		return

-	if(exchange_parts(user, I))
-		return
-
 	default_deconstruction_crowbar(I)

 /obj/machinery/power/compressor/process()
@@ -243,9 +240,6 @@
 			stat |= BROKEN
 		return

-	if(exchange_parts(user, I))
-		return
-
 	default_deconstruction_crowbar(I)

 /obj/machinery/power/turbine/ui_interact(mob/user)