From 18f3e190510ccf9fa5ec5a34a8ba9c0c96abb1ba Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri, 23 Jul 2021 13:52:43 -0400
Subject: [PATCH] Apply more suggestions without doing multiline

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
---
 code/game/gamemodes/nuclear/nuclearbomb.dm |  6 +++---
 code/game/gamemodes/objective.dm           |  1 +
 code/game/gamemodes/steal_items.dm         |  3 ++-
 code/game/objects/items/theft_items.dm     | 10 +++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 95ff1252c76..c9a9a1f556c 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -254,11 +254,11 @@ GLOBAL_VAR(bomb_set)
 	if(panel_open)
 		if(removal_stage == NUKE_CORE_FULLY_EXPOSED && core)
 			if(timing) //removing the core is less risk then cutting wires, and doesnt take long, so we should not let crew do it while the nuke is armed. You can however get to it, without the special screwdriver, if you put the NAD in.
-				to_chat(user, "<span class='warning'>The [core] won't budge, metal clamps keep it in!</span>")
+				to_chat(user, "<span class='warning'>[core] won't budge, metal clamps keep it in!</span>")
 				return
-			user.visible_message("<span class='notice'>[user] starts to pull [core] out of the [src]!</span>", "<span class='notice'>You start to pull [core] out of the [src]!</span>")
+			user.visible_message("<span class='notice'>[user] starts to pull [core] out of [src]!</span>", "<span class='notice'>You start to pull [core] out of [src]!</span>")
 			if(do_after(user, 50, target = src))
-				user.visible_message("<span class='notice'>[user] pulls [core] out of the [src]!</span>", "<span class='notice'>You pull [core] out of the [src]! Might want to put it somewhere safe.</span>")
+				user.visible_message("<span class='notice'>[user] pulls [core] out of [src]!</span>", "<span class='notice'>You pull [core] out of [src]! Might want to put it somewhere safe.</span>")
 				core.forceMove(loc)
 				core = null
 
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 2efad59ba39..b5bb07ff234 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -449,6 +449,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
 	else
 		to_chat(mob, "<span class='userdanger'>Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).</span>")
 		message_admins("[ADMIN_LOOKUPFLW(mob)] Failed to spawn with their [item_path] theft kit.")
+		qdel(I)
 
 /datum/objective/steal/exchange
 	martyr_compatible = 0
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index 2ea71edc2cd..24ea05d786c 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -145,7 +145,8 @@
 	typepath = /obj/item/nuke_core/supermatter_sliver
 	protected_jobs = list("Chief Engineer", "Engineer", "Atmospheric Technician") //Unlike other steal objectives, all jobs in the department have easy access, and would not be noticed at all stealing this
 	location_override = "Engineering. You can use the box and instructions provided to harvest the sliver."
-	special_equipment =/obj/item/storage/box/syndie_kit/supermatter
+	special_equipment = /obj/item/storage/box/syndie_kit/supermatter
+
 /datum/theft_objective/plutonium_core
 	name = "the plutonium core from the stations nuclear device"
 	typepath = /obj/item/nuke_core/plutonium
diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm
index 57074926ced..70806866e07 100644
--- a/code/game/objects/items/theft_items.dm
+++ b/code/game/objects/items/theft_items.dm
@@ -31,7 +31,7 @@
 		return ..()
 
 /obj/item/nuke_core/process()
-	if(cooldown < world.time - 60)
+	if(cooldown < world.time - 6 SECONDS)
 		cooldown = world.time
 		flick(pulseicon, src)
 		radiation_pulse(src, 400, 2)
@@ -55,11 +55,11 @@
 	QDEL_NULL(core)
 	return ..()
 
-/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/ncore, mob/user)
-	if(core || !istype(ncore))
+/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/new_core, mob/user)
+	if(core || !istype(new_core))
 		return FALSE
-	ncore.forceMove(src)
-	core = ncore
+	new_core.forceMove(src)
+	core = new_core
 	icon_state = "core_container_loaded"
 	to_chat(user, "<span class='warning'>Container is sealing...</span>")
 	addtimer(CALLBACK(src, .proc/seal), 10 SECONDS)