From 5bc348c3660e9904f70ef684b2eeda3bbb1978a3 Mon Sep 17 00:00:00 2001
From: bgobandit <bgobandit@users.noreply.github.com>
Date: Sat, 17 Jun 2017 22:32:38 -0400
Subject: [PATCH] Adds traitor steal objective: the Supermatter Sliver. (Fixed)
 (#27913)

* Adds a new steal objective, the Supermatter Sliver.

* actually commits theft_tools honke

* i actually dk what this is

* fixes v1

* Supersmatter sliver requested changes

* you know what I fucking hate is unchecking shit

* please does this fix it fucking dme clown shit

* placates the cyberboss and the lziard

* fucking clownery

* I forgot to fucking check it

* Hope this fixes it

* will my children inherit this PR

* reeeeeeeeeeeeeeee

* Let's put this horse to rest now....
---
 code/game/atoms_movable.dm                    |   9 +-
 code/game/gamemodes/objective_items.dm        |  10 +
 code/game/objects/items/nuke_tools.dm         |  83 ------
 code/game/objects/items/theft_tools.dm        | 243 ++++++++++++++++++
 .../items/weapons/storage/uplink_kits.dm      |   9 +
 code/modules/mob/living/living.dm             |   3 +
 code/modules/mob/mob.dm                       |  14 +-
 code/modules/power/supermatter/supermatter.dm |   9 +-
 icons/obj/nuke_tools.dmi                      | Bin 2480 -> 4423 bytes
 tgstation.dme                                 |   2 +-
 tools/tgstation-server                        |   2 +-
 11 files changed, 287 insertions(+), 97 deletions(-)
 delete mode 100644 code/game/objects/items/nuke_tools.dm
 create mode 100644 code/game/objects/items/theft_tools.dm

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 108d70c0b91..6a61416366e 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -197,7 +197,7 @@
 
 	QDEL_NULL(proximity_monitor)
 	QDEL_NULL(language_holder)
-	
+
 	unbuckle_all_mobs(force=1)
 
 	. = ..()
@@ -686,3 +686,10 @@
 //Returns an atom's power cell, if it has one. Overload for individual items.
 /atom/movable/proc/get_cell()
 	return
+
+/atom/movable/proc/can_be_pulled(user)
+	if(src == user || !isturf(loc))
+		return FALSE
+	if(anchored || throwing)
+		return FALSE
+	return TRUE
\ No newline at end of file
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 72baa586c74..703f1a9760c 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -83,6 +83,16 @@
 
 /datum/objective_item/steal/nuke_core/New()
 	special_equipment += /obj/item/weapon/storage/box/syndie_kit/nuke
+	..()
+
+/datum/objective_item/steal/supermatter
+	name = "a sliver of a supermatter crystal. Be sure to use the proper safety equipment when extracting the sliver!"
+	targetitem = /obj/item/nuke_core/supermatter_sliver
+	difficulty = 15
+
+/datum/objective_item/steal/supermatter/New()
+	special_equipment += /obj/item/weapon/storage/box/syndie_kit/supermatter
+	..()
 
 //Items with special checks!
 /datum/objective_item/steal/plasma
diff --git a/code/game/objects/items/nuke_tools.dm b/code/game/objects/items/nuke_tools.dm
deleted file mode 100644
index 40c7887914c..00000000000
--- a/code/game/objects/items/nuke_tools.dm
+++ /dev/null
@@ -1,83 +0,0 @@
-//Items for nuke theft traitor objective
-
-//the nuke core - objective item
-/obj/item/nuke_core
-	name = "plutonium core"
-	desc = "Extremely radioactive. Wear goggles."
-	icon = 'icons/obj/nuke_tools.dmi'
-	icon_state = "plutonium_core"
-	item_state = "plutoniumcore"
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	var/pulse = 0
-	var/cooldown = 0
-
-/obj/item/nuke_core/New()
-	..()
-	START_PROCESSING(SSobj, src)
-
-/obj/item/nuke_core/attackby(obj/item/nuke_core_container/container, mob/user)
-	if(istype(container))
-		container.load(src, user)
-	else
-		return ..()
-
-/obj/item/nuke_core/process()
-	if(cooldown < world.time - 60)
-		cooldown = world.time
-		flick("plutonium_core_pulse", src)
-		radiation_pulse(get_turf(src), 1, 4, 40, 1)
-
-//nuke core box, for carrying the core
-/obj/item/nuke_core_container
-	name = "nuke core container"
-	desc = "Solid container for radioactive objects."
-	icon = 'icons/obj/nuke_tools.dmi'
-	icon_state = "core_container_empty"
-	item_state = "tile"
-	var/obj/item/nuke_core/core = null
-
-/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/ncore, mob/user)
-	if(core || !istype(ncore))
-		return 0
-	ncore.forceMove(src)
-	core = ncore
-	icon_state = "core_container_loaded"
-	to_chat(user, "<span class='warning'>Container is sealing...</span>")
-	addtimer(CALLBACK(src, .proc/seal), 50)
-	return 1
-
-/obj/item/nuke_core_container/proc/seal()
-	if(istype(core))
-		STOP_PROCESSING(SSobj, core)
-		icon_state = "core_container_sealed"
-		playsound(loc, 'sound/items/deconstruct.ogg', 60, 1)
-		if(ismob(loc))
-			to_chat(loc, "<span class='warning'>[src] is permanently sealed, [core]'s radiation is contained.</span>")
-
-/obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user)
-	if(istype(core))
-		if(!user.temporarilyRemoveItemFromInventory(core))
-			to_chat(user, "<span class='warning'>The [core] is stuck to your hand!</span>")
-			return
-		else
-			load(core, user)
-	else
-		return ..()
-
-//snowflake screwdriver, works as a key to start nuke theft, traitor only
-/obj/item/weapon/screwdriver/nuke
-	name = "screwdriver"
-	desc = "A screwdriver with an ultra thin tip."
-	icon = 'icons/obj/nuke_tools.dmi'
-	icon_state = "screwdriver_nuke"
-	toolspeed = 0.5
-
-/obj/item/weapon/paper/nuke_instructions
-	info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:<br>\
-	<ul>\
-	<li>Use a screwdriver with a very thin tip (provided) to unscrew the terminal's front panel</li>\
-	<li>Dislodge and remove the front panel with a crowbar</li>\
-	<li>Cut the inner metal plate with a welding tool</li>\
-	<li>Pry off the inner plate with a crowbar to expose the radioactive core</li>\
-	<li>Use the core container to remove the plutonium core; the container will take some time to seal</li>\
-	<li>???</li>"
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
new file mode 100644
index 00000000000..ec82a376ade
--- /dev/null
+++ b/code/game/objects/items/theft_tools.dm
@@ -0,0 +1,243 @@
+//Items for nuke theft, supermatter theft traitor objective
+
+
+// STEALING THE NUKE
+
+//the nuke core - objective item
+/obj/item/nuke_core
+	name = "plutonium core"
+	desc = "Extremely radioactive. Wear goggles."
+	icon = 'icons/obj/nuke_tools.dmi'
+	icon_state = "plutonium_core"
+	item_state = "plutoniumcore"
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	var/pulse = 0
+	var/cooldown = 0
+	var/pulseicon = "plutonium_core_pulse"
+
+/obj/item/nuke_core/Initialize()
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
+/obj/item/nuke_core/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
+/obj/item/nuke_core/attackby(obj/item/nuke_core_container/container, mob/user)
+	if(istype(container))
+		container.load(src, user)
+	else
+		return ..()
+
+/obj/item/nuke_core/process()
+	if(cooldown < world.time - 60)
+		cooldown = world.time
+		flick(pulseicon, src)
+		radiation_pulse(get_turf(src), 1, 4, 40, 1)
+
+//nuke core box, for carrying the core
+/obj/item/nuke_core_container
+	name = "nuke core container"
+	desc = "Solid container for radioactive objects."
+	icon = 'icons/obj/nuke_tools.dmi'
+	icon_state = "core_container_empty"
+	item_state = "tile"
+	var/obj/item/nuke_core/core
+
+/obj/item/nuke_core_container/Destroy()
+	QDEL_NULL(core)
+	return ..()
+
+/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/ncore, mob/user)
+	if(core || !istype(ncore))
+		return FALSE
+	ncore.forceMove(src)
+	core = ncore
+	icon_state = "core_container_loaded"
+	to_chat(user, "<span class='warning'>Container is sealing...</span>")
+	addtimer(CALLBACK(src, .proc/seal), 50)
+	return TRUE
+
+/obj/item/nuke_core_container/proc/seal()
+	if(istype(core))
+		STOP_PROCESSING(SSobj, core)
+		icon_state = "core_container_sealed"
+		playsound(src, 'sound/items/deconstruct.ogg', 60, 1)
+		if(ismob(loc))
+			to_chat(loc, "<span class='warning'>[src] is permanently sealed, [core]'s radiation is contained.</span>")
+
+/obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user)
+	if(istype(core))
+		if(!user.temporarilyRemoveItemFromInventory(core))
+			to_chat(user, "<span class='warning'>The [core] is stuck to your hand!</span>")
+			return
+		else
+			load(core, user)
+	else
+		return ..()
+
+//snowflake screwdriver, works as a key to start nuke theft, traitor only
+/obj/item/weapon/screwdriver/nuke
+	name = "screwdriver"
+	desc = "A screwdriver with an ultra thin tip."
+	icon = 'icons/obj/nuke_tools.dmi'
+	icon_state = "screwdriver_nuke"
+	toolspeed = 0.5
+
+/obj/item/weapon/paper/nuke_instructions
+	info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:<br>\
+	<ul>\
+	<li>Use a screwdriver with a very thin tip (provided) to unscrew the terminal's front panel</li>\
+	<li>Dislodge and remove the front panel with a crowbar</li>\
+	<li>Cut the inner metal plate with a welding tool</li>\
+	<li>Pry off the inner plate with a crowbar to expose the radioactive core</li>\
+	<li>Use the core container to remove the plutonium core; the container will take some time to seal</li>\
+	<li>???</li>\
+	</ul>"
+
+// STEALING SUPERMATTER
+
+/obj/item/weapon/paper/supermatter_sliver_instructions
+	info = "How to safely extract a supermatter sliver:<br>\
+	<ul>\
+	<li>Approach an active supermatter crystal with proper protective gear. DO NOT MAKE PHYSICAL CONTACT.</li>\
+	<li>Use a supermatter scalpel (provided) to slice off a sliver of the crystal.</li>\
+	<li>Use supermatter extraction tongs (also provided) to safely remove the sliver.</li>\
+	<li>Physical contact of any object with the sliver will dust the object, as well as yourself.</li>\
+	<li>Use the tongs to place the sliver into the provided container, which will take some time to seal</li>\
+	<li>Get the hell out before the crystal delaminates.</li>\
+	<li>???</li>\
+	</ul>"
+
+/obj/item/nuke_core/supermatter_sliver
+	name = "supermatter sliver"
+	desc = "A tiny, highly volatile sliver of a supermatter crystal. Do not handle without protection!"
+	icon_state = "supermatter_sliver"
+	item_state = "supermattersliver"
+	pulseicon = "supermatter_sliver_pulse"
+
+/obj/item/nuke_core/supermatter_sliver/attack_tk() // no TK dusting memes
+	return FALSE
+
+/obj/item/nuke_core/supermatter_sliver/can_be_pulled(user) // no drag memes
+	return FALSE
+
+/obj/item/nuke_core/supermatter_sliver/attackby(obj/item/W, mob/living/user, params)
+	if(istype(W, /obj/item/weapon/hemostat/supermatter))
+		var/obj/item/weapon/hemostat/supermatter/tongs = W
+		if (tongs.sliver)
+			to_chat(user, "<span class='notice'>\The [tongs] is already holding a supermatter sliver!</span>")
+			return FALSE
+		forceMove(tongs)
+		tongs.sliver = src
+		tongs.icon_state = "supermatter_tongs_loaded"
+		to_chat(user, "<span class='notice'>You carefully pick up [src] with [tongs].</span>")
+	else if(istype(W, /obj/item/weapon/scalpel/supermatter) || istype(W, /obj/item/nuke_core_container/supermatter/)) // we don't want it to dust
+		return
+	else
+		to_chat(user, "<span class='notice'>As it touches \the [src], both \the [src] and \the [W] burst into dust!</span>")
+		radiation_pulse(get_turf(user), 1, 2, 10, 1)
+		playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
+		qdel(W)
+		qdel(src)
+
+/obj/item/nuke_core/supermatter_sliver/pickup(mob/living/user)
+	..()
+	if(!iscarbon(user))
+		return FALSE
+	var/mob/ded = user
+	to_chat(user, "<span class='warning'>You reach for the supermatter sliver with your hands. That was dumb.</span>")
+	radiation_pulse(get_turf(user), 2, 4, 50, 1)
+	playsound(get_turf(user), 'sound/effects/supermatter.ogg', 50, 1)
+	ded.dust()
+
+/obj/item/nuke_core_container/supermatter
+	name = "supermatter bin"
+	desc = "A tiny receptacle that releases an inert freon mix upon sealing, allowing a sliver of a supermatter crystal to be safely stored.."
+	var/obj/item/nuke_core/supermatter_sliver/sliver
+
+/obj/item/nuke_core_container/supermatter/Destroy()
+	QDEL_NULL(sliver)
+	return ..()
+
+/obj/item/nuke_core_container/supermatter/load(obj/item/weapon/hemostat/supermatter/T, mob/user)
+	if(!istype(T) || !T.sliver)
+		return FALSE
+	T.sliver.forceMove(src)
+	sliver = T.sliver
+	T.sliver = null
+	icon_state = "core_container_loaded"
+	to_chat(user, "<span class='warning'>Container is sealing...</span>")
+	addtimer(CALLBACK(src, .proc/seal), 50)
+	return TRUE
+
+/obj/item/nuke_core_container/supermatter/seal()
+	if(istype(sliver))
+		STOP_PROCESSING(SSobj, sliver)
+		icon_state = "core_container_sealed"
+		playsound(src, 'sound/items/Deconstruct.ogg', 60, 1)
+		if(ismob(loc))
+			to_chat(loc, "<span class='warning'>[src] is permanently sealed, [sliver] is safely contained.</span>")
+
+/obj/item/nuke_core_container/supermatter/attackby(obj/item/weapon/hemostat/supermatter/tongs, mob/user)
+	if(istype(tongs))
+		if(!user.temporarilyRemoveItemFromInventory(tongs))
+			to_chat(user, "<span class='warning'>\The [tongs] is stuck to your hand!</span>")
+		else
+			load(sliver, user)
+	else
+		return ..()
+
+/obj/item/weapon/scalpel/supermatter
+	name = "supermatter scalpel"
+	desc = "A scalpel with a tip of condensed freon gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal."
+	icon = 'icons/obj/nuke_tools.dmi'
+	icon_state = "supermatter_scalpel"
+	toolspeed = 0.5
+	damtype = "fire"
+	usesound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/weapon/hemostat/supermatter
+	name = "supermatter extraction tongs"
+	desc = "A pair of tongs made from condensed freon gas, searingly cold to the touch, that can safely grip a supermatter sliver."
+	icon = 'icons/obj/nuke_tools.dmi'
+	icon_state = "supermatter_tongs"
+	toolspeed = 0.75
+	damtype = "fire"
+	var/obj/item/nuke_core/supermatter_sliver/sliver
+
+/obj/item/weapon/hemostat/supermatter/Destroy()
+	QDEL_NULL(sliver)
+	return ..()
+
+/obj/item/weapon/hemostat/supermatter/afterattack(atom/O, mob/user, proximity)
+	if(!sliver)
+		return
+	if(ismovableatom(O))
+		Consume(O)
+
+/obj/item/weapon/hemostat/supermatter/throw_impact(atom/hit_atom) // no instakill supermatter javelins
+	if(sliver)
+		sliver.forceMove(loc)
+		to_chat(usr, "<span class='notice'>\The [sliver] falls out of \the [src] as you throw them.</span>")
+		sliver = null
+	..()
+
+/obj/item/weapon/hemostat/supermatter/proc/Consume(atom/movable/AM, mob/user)
+	if(ismob(AM))
+		var/mob/victim = AM
+		victim.dust()
+		message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)].")
+		investigate_log("has consumed [key_name(victim)].", "supermatter")
+	else
+		investigate_log("has consumed [AM].", "supermatter")
+		qdel(AM)
+	user.visible_message("<span class='danger'>As [user] touches \the [AM] with \a [src], silence fills the room...</span>",\
+			"<span class='userdanger'>You touch \the [AM] with \the [src], and everything suddenly goes silent.</span>\n<span class='notice'>\The [AM] flashes into dust, and soon as you can register this, you do as well.</span>",\
+			"<span class='italics'>Everything suddenly goes silent.</span>")
+	radiation_pulse(get_turf(user), 2, 4, 50, 1)
+	playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
+	user.dust()
+	icon_state = "supermatter_tongs"
+	QDEL_NULL(sliver)
+
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 6dc32122e6f..c80f9cf08f2 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -238,6 +238,15 @@
 	new /obj/item/nuke_core_container(src)
 	new /obj/item/weapon/paper/nuke_instructions(src)
 
+/obj/item/weapon/storage/box/syndie_kit/supermatter
+	name = "box"
+
+/obj/item/weapon/storage/box/syndie_kit/supermatter/PopulateContents()
+	new /obj/item/weapon/scalpel/supermatter(src)
+	new /obj/item/weapon/hemostat/supermatter(src)
+	new /obj/item/nuke_core_container/supermatter(src)
+	new /obj/item/weapon/paper/supermatter_sliver_instructions(src)
+
 /obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade
 	name = "boxed virus grenade kit"
 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index e9ed212fd10..e3b0673cece 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -928,3 +928,6 @@
 	if((movement_type & FLYING) && !stat)
 		return
 	..()
+
+/mob/living/can_be_pulled()
+	return ..() && !(buckled && buckled.buckle_prevents_pull)
\ No newline at end of file
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 80956cf08f5..36344adf242 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -306,17 +306,11 @@
 //this and stop_pulling really ought to be /mob/living procs
 /mob/proc/start_pulling(atom/movable/AM, supress_message = 0)
 	if(!AM || !src)
-		return
-	if(AM == src || !isturf(AM.loc))
-		return
-	if(AM.anchored || AM.throwing)
-		return
-	if(isliving(AM))
-		var/mob/living/L = AM
-		if(L.buckled && L.buckled.buckle_prevents_pull)
-			return
+		return FALSE
+	if(!(AM.can_be_pulled(src)))
+		return FALSE
 	if(throwing || incapacitated())
-		return
+		return FALSE
 
 	AM.add_fingerprint(src)
 
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index df309c72523..e7c255212ab 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -464,7 +464,14 @@
 /obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params)
 	if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
 		return
-	if(user.drop_item(W))
+	if(istype(W, /obj/item/weapon/scalpel/supermatter))
+		playsound(src, W.usesound, 100, 1)
+		to_chat(user, "<span class='notice'>You carefully begin to scrape \the [src] with \the [W]...</span>")
+		if(do_after(user, 60 * W.toolspeed, TRUE, src))
+			to_chat(user, "<span class='notice'>You extract a sliver from \the [src]. \The [src] begins to react violently!</span>")
+			new /obj/item/nuke_core/supermatter_sliver(user.loc)
+			matter_power += 200
+	else if(user.dropItemToGround(W))
 		user.visible_message("<span class='danger'>As [user] touches \the [src] with \a [W], silence fills the room...</span>",\
 			"<span class='userdanger'>You touch \the [src] with \the [W], and everything suddenly goes silent.</span>\n<span class='notice'>\The [W] flashes into dust as you flinch away from \the [src].</span>",\
 			"<span class='italics'>Everything suddenly goes silent.</span>")
diff --git a/icons/obj/nuke_tools.dmi b/icons/obj/nuke_tools.dmi
index 11f90a3825a5fbbde7fd488a3943d356a15da4f6..2c10b5424ff2641a91825db79f6df0f38c828750 100644
GIT binary patch
literal 4423
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

literal 2480
zcmbW3c|6oxAIFE0Em<bfRg8Uv+({v1M%J0KlWaGNOlYz%nZ?`?E@d|+X{cOEwlIne
zMw@F(wn8&y8PY`=GvjCLneKnj>v{U)dHy)x_xa<z&iTGR=X^e|li}iIzeiF@5(EP6
zL8ENk1T6b8#6<-)a}aY_0Dhu}SB%ZY=)kCuh?tP@D<Dw9?b4jC&~CV_&EVU!`aKQm
z$D(TK$E07RJ=q4UJ;Lg%pAOb~Kf4kgvD>i=y?|8=4xV39VoI;Xf=3(J8g5Np))H;~
zdYF8p2gwl09`7{XNX69*G%N+;ncRCQp#(Q7%Gif_>6QYa-6rHNN8VAK4Sj83P#kyr
zmzWJ<E&02$sXE7_)ubA;A|5lRf?IxfY3_nyE%F#d6ge&R7T)gN_u`Mcc!L33rgPVf
zFR4VK)KcZ6j%eSF`<?*=m$6i#8hOLc999CdF>{Q%jG5At_ht0tDCZUo&c8^i{q)Ae
zMLCSPOFymSnt#egI}k`b25ocFBjNT^sq>`~uY<2T&NLV_#yzLa6rDM=`)xyWdi6)G
zii*V^q@wdcSEjfmx3+T3olj>-PB*J4c-Kqru6>*Ld+M&1bedD7OvO@HNZXs%n_(}O
z|1Q_2qc2dNX|K%RXUWLtnOM`&>|uVM!)i%uZmyiH`U~yP`&17ckVM&(lWgRFhWG02
z!ZuXfYF5;r@w0XFTI05gl24@Xi?~D`u5gU9Xo~(a7JZcQ^;GzK3Zfl|EahDbg(nRy
zw*2in8OLsGZEJPFuRp}|sw}Ez{lPh6eW?ATyf8kgTd#dC+5)`1Rhr9ujF!;kl$QEa
zkOA?r`~$hN&^gYm%tOdabirg@EM$87tI$WkK}*|gc~~BB(wx=PVvqGzE}DLAN5Y@l
zQ3dHO$EHVZHV<CI^k$FU&OX3~Y53#BiKbMsTNWJA^F+hdW@oGGXA^r_O-W|6iAJu*
ziR!A96)9^belJXY5q>ZyX^$oIxtUG#_KDqNDVVOI%imi?rWWw%aiQ}rbP_k`sWd7G
z%`j1u&q-&L$ffHDXeE^KQ$Tz=Pm}9Jn6X<=c~$3$k5{WV47`4OGD<iI46*Pl-)O9@
z&#zuz$-Y30;#AW$%qE!<Ag|(ITZeT+ap$MKn=@;a*s!Din?-md%}c4%*MXkb<B)pz
zHz~*dHeI&kvIrXnLpG6|)*1LAY*;As;$;{d=?(Z;l<|+N-VBsxhiBnyzL3rhJ3^D;
zNK>GES062YBg^Ef6k{uBE^JR1voL2}CP*NRHJ{`ZL2Do0cAuOP9P?LQtC$BEp{OwL
z6tF`sWF;=-o4E%<n>a>v35vCQ^h<v0gvv@`0^7t0lM~__=U-Ct$mAC5N=1X-CX;{-
z|KjN|OKw`VhJuZaFv4I5<+S4fEIg|XE3;u{?6K3fq4<vY_k&4ei&$C5{>>Y+ExsX_
zCrod&un>`x#{J56ZOw|&`Jc#@1U0j&4<o5>@=ad4x>A>4f>hQh04!%9>Fjr5WyL$5
zv#c)A%W&{y(M%zHn3m;eUYTpQ_MGgm1UAItj+l5uLn%JvLW=B6I?{a|fq$f6?}592
zpN*L)BCMJMKX#DnjjR{+45Q{#&DQQ;@Tyf<+C9WXx}RA1BCdaPy{t~-8xWn(-QPig
z!;`jnU2oc*z5Yn8(Yc{4-S_JaWxIxYqcuZonXZ$H>ZNgegC@-*n>oLbs3t)>w7Kmk
zS9f-i{P9bXjk@cItv|@1>w4#K+)YHyMbE=!(NisO|CCX}6n}$(cQrN6+R@JfsH^cN
zYw7Hyb-gO7rgOwmVYB!)vv`C^O~CE(@?vTqzD5PUpznpvp1Gd_^z_LPAP{-FCvN1&
zwd3{k|9OpP$P0ToQ<#Em5kusA;E|l8%_muh|MYgjt!f!mo~`4Em}XB!@FF-b$gPnp
zgf^_|*&u0}j`$HQ^YlX>BUI7S6Qd2!IFYA|M<#QP6Y0D_3R49>@QMF+PHzt0+Ytkt
zGF_w|3Lu^UjJ%<;paH})|07BK=ZDzi0rW96%Ed?|AEt(ZGEL~+6sR+?e?-jVDQ?>1
zMN-*knPgySE^J)v*l*N<%+?`@g)rw{&-g<b9dD{MYT%m;$4I2$p>rjXV|c601-P~H
z;oGR)d14b#F4EU@IB>J!<3>z8oRp+OQ1s2HFEfvDU~DC<T1y-^@y`DIAh~#nnDQa^
z)l^(1;sb4NeQ`MT(6%fFE6=tsfhLL<J#x0sOY@A?&)A63q>MNaEGvEa%#3^NSKied
zUp^#(LCikmA6DFC;G5ppq|wT_n_8ew4ld;2@y1zP_5^}k$-~~EYSk`b2%WlDk4}mQ
zaFZkcJfk~#ub-;4`O#prlcIH^gUoBU$JSN+Sd=5OwADOuPa8%5Q5Toy11bLm?s<YG
zJCogrP?bxyhRdZ2LtJ$P)BhD(8)B#oIfWWxFNK-gafj?j=2{9F<;s5yq*e5tt^t#{
z*bd%NH9_JoTkBSuAdPq0BJzMt&yI`P6SSkO(GQ~+Pl4<axDgeP)jFZqC4OmDH2>3`
zp9+~#wuH`Hp?eS%+uWR05^iO6hEBq3K<wJL%bl&BK@s&nP?x3LX&Xc2rFnCJSB0(a
zc5_&tbzc=L7x+u|6)%iS%JfWn?+cBv-)U`7aWVWp<3wu*Kv`T8NEEz!gG)+}*aZCQ
zMNfYJtnDnUP_t7l1R(eKWnbPrBv3-}?$0y!-}6_Uc$(<!oV}(id-5Il|C8~*>aO**
zq0i6YtSHGtcaBzgN-KUMq$Bo=r!vUzSwe%KZXx{Gv7jxnFcfxXFPz+4IM{I&40_kN
zI)<eJd}RDa_GN`stFC=UCH)tIgSB~uT0Pyc0Np}HcaZ|f(yTOYl3Y|&)>k$+gFC3C
zq?FS;_g86Y=@s9=z`z$cLyDA-k59zff-A2;#F9j+aFf7f+JZXo)FG7BJ=aL~H_Kdf
zo^U?LDAoCQuw@;rX7)y0x>RNGb$>)-l+^K~$%2;6MKv|`r;#4r6Yv8E&Rti#>td-c
exl8lzmW)K<TTqX3(173z21469+0<GET>BS=j+5j7

diff --git a/tgstation.dme b/tgstation.dme
index e9f5b8b5218..1a78510eee9 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -724,10 +724,10 @@
 #include "code\game\objects\items\documents.dm"
 #include "code\game\objects\items\eightball.dm"
 #include "code\game\objects\items\latexballoon.dm"
-#include "code\game\objects\items\nuke_tools.dm"
 #include "code\game\objects\items\religion.dm"
 #include "code\game\objects\items\shooting_range.dm"
 #include "code\game\objects\items\taster.dm"
+#include "code\game\objects\items\theft_tools.dm"
 #include "code\game\objects\items\toys.dm"
 #include "code\game\objects\items\trash.dm"
 #include "code\game\objects\items\devices\aicard.dm"
diff --git a/tools/tgstation-server b/tools/tgstation-server
index 8c6d31f3942..979d00ea6f9 160000
--- a/tools/tgstation-server
+++ b/tools/tgstation-server
@@ -1 +1 @@
-Subproject commit 8c6d31f3942e5837fcc7b8111cda8ab1cbc7a5c3
+Subproject commit 979d00ea6f98ecb5699f55c83cc7a921b47a9803