From 6079cb1839928b461195c43e235243d422ac111f Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Sun, 7 Apr 2019 23:12:15 +0200
Subject: [PATCH 1/3] allows nukies to buy hijack items
---
code/datums/uplink_item.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index e12aa5cd9db..cede3097321 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/uplink/U)
- if(hijack_only)
+ if(hijack_only && !GAMEMODE_IS_NUCLEAR)//nukies get items that regular traitors only get with hijack. If a hijack-only item is not for nukies, then exclude it via the gamemode list.
if(!(locate(/datum/objective/hijack) in usr.mind.objectives))
to_chat(usr, "The Syndicate will only issue this extremely dangerous item to agents assigned the Hijack objective.")
return
From e12653306a78fe64d588325a4f875e49c13674dd Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Sun, 7 Apr 2019 23:16:54 +0200
Subject: [PATCH 2/3] Thought of a better way to do it (probably
---
code/datums/uplink_item.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index cede3097321..bed04dc07a7 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/uplink/U)
- if(hijack_only && !GAMEMODE_IS_NUCLEAR)//nukies get items that regular traitors only get with hijack. If a hijack-only item is not for nukies, then exclude it via the gamemode list.
+ if(hijack_only && !(usr.mind.special_role == SPECIAL_ROLE_NUKEOPS))//nukies get items that regular traitors only get with hijack. If a hijack-only item is not for nukies, then exclude it via the gamemode list.
if(!(locate(/datum/objective/hijack) in usr.mind.objectives))
to_chat(usr, "The Syndicate will only issue this extremely dangerous item to agents assigned the Hijack objective.")
return
From 106b2427701574a459303e1c72390e19ddfa1eb1 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Sun, 7 Apr 2019 23:19:11 +0200
Subject: [PATCH 3/3] Let's fix that too
---
code/datums/uplink_item.dm | 7 -------
1 file changed, 7 deletions(-)
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index bed04dc07a7..1e9553f15fc 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -1330,13 +1330,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 0
hijack_only = TRUE //This is an item only useful for a hijack traitor, as such, it should only be available in those scenarios.
cant_discount = TRUE
- excludefrom = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/device_tools/singularity_beacon/nuke
- reference = "SNGBN"
- hijack_only = FALSE // This inherited version exists so nukies can use it while keeping the original hijack only
- excludefrom = list()
- gamemodes = list(/datum/game_mode/nuclear)
/datum/uplink_item/device_tools/syndicate_detonator
name = "Syndicate Detonator"