From ddc3a02ab33230f174e8442c4e35b00281af353e Mon Sep 17 00:00:00 2001
From: Mark van Alphen <markvanalphen2@gmail.com>
Date: Sun, 7 Apr 2019 23:04:43 +0200
Subject: [PATCH] Fix thermal for saboteur, reinforcement bugfix, re-add C4
 pack

---
 code/datums/uplink_item.dm                             | 7 +++++++
 code/modules/antagonists/_common/antag_spawner.dm      | 2 +-
 code/modules/mob/living/silicon/robot/robot_modules.dm | 3 ---
 code/modules/mob/living/silicon/robot/syndicate.dm     | 9 +++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 4f2ac8ef1ed..b8898bb8df7 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -942,6 +942,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	item = /obj/item/grenade/plastic/c4
 	cost = 1
 
+/datum/uplink_item/explosives/plastic_explosives_pack
+	name = "Pack of 5 C-4 Explosives"
+	desc = "A package containing 5 C-4 Explosives at a discounted price. For when you need that little bit extra for your sabotaging needs."
+	reference = "C4P"
+	item = /obj/item/storage/box/syndie_kit/c4
+	cost = 4
+
 /datum/uplink_item/explosives/c4bag
 	name = "Bag of C-4 explosives"
 	desc = "Because sometimes quantity is quality. Contains 10 C-4 plastic explosives."
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index de94b27b425..bc6276010ad 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -20,7 +20,7 @@
 	var/checking = FALSE
 
 /obj/item/antag_spawner/nuke_ops/proc/before_candidate_search(user)
-	return
+	return TRUE
 
 /obj/item/antag_spawner/nuke_ops/proc/check_usability(mob/user)
 	if(used)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 44f21fcaace..a84af2c8254 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -441,9 +441,6 @@
 /obj/item/robot_module/syndicate_saboteur
 	name = "engineering robot module" //to disguise in examine
 	module_type = "Malf"
-	module_actions = list(
-		/datum/action/innate/robot_sight/thermal,
-	)
 
 	stacktypes = list(
 		/obj/item/stack/sheet/metal/cyborg = 50,
diff --git a/code/modules/mob/living/silicon/robot/syndicate.dm b/code/modules/mob/living/silicon/robot/syndicate.dm
index 48179e8d374..cc5fe804a36 100644
--- a/code/modules/mob/living/silicon/robot/syndicate.dm
+++ b/code/modules/mob/living/silicon/robot/syndicate.dm
@@ -70,12 +70,17 @@
 /mob/living/silicon/robot/syndicate/saboteur/init()
 	..()
 	module = new /obj/item/robot_module/syndicate_saboteur(src)
+
 	var/obj/item/borg/upgrade/selfrepair/SR = new /obj/item/borg/upgrade/selfrepair(src)
 	SR.cyborg = src
 	SR.icon_state = "selfrepair_off"
-	var/datum/action/A = new /datum/action/item_action/toggle(SR)
-	A.Grant(src)
 
+	var/datum/action/self_repair = new /datum/action/item_action/toggle(SR)
+	self_repair.Grant(src)
+
+	var/datum/action/thermals = new /datum/action/innate/robot_sight/thermal()
+	thermals.Grant(src)
+	
 /mob/living/silicon/robot/syndicate/saboteur/verb/modify_name()
 	set name = "Modify Name"
 	set desc = "Change your systems' registered name to fool Nanotrasen systems. No cost."