diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 43202509b69..ff52749c928 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1064,7 +1064,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/explosives/syndicate_bomb/nuke reference = "NSB" cost = 11 - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) surplus = 0 cant_discount = TRUE hijack_only = FALSE @@ -1083,7 +1083,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/explosives/emp_bomb/nuke reference = "NSBEMP" cost = 10 - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) surplus = 0 cant_discount = TRUE @@ -1157,7 +1157,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "NAPG" hijack_only = FALSE cost = 12 - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) surplus = 0 cant_discount = TRUE @@ -1240,6 +1240,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 4 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) +/datum/uplink_item/stealthy_tools/chameleon/nuke + reference = "NCHAM" + cost = 6 + excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) + /datum/uplink_item/stealthy_tools/voice_modulator name = "Chameleon Voice Modulator Mask" desc = "A syndicate tactical mask equipped with chameleon technology and a sound modulator for disguising your voice. \ @@ -1249,11 +1254,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 1 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/stealthy_tools/chameleon/nuke - reference = "NCHAM" - cost = 6 - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) - /datum/uplink_item/stealthy_tools/syndigaloshes name = "No-Slip Chameleon Shoes" desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. \ @@ -1266,8 +1266,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/stealthy_tools/syndigaloshes/nuke reference = "NNSSS" cost = 4 - excludefrom = list() - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) /datum/uplink_item/stealthy_tools/chameleon_proj name = "Chameleon-Projector" @@ -1315,21 +1314,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 4 surplus = 30 -/datum/uplink_item/stealthy_tools/syndigaloshes - name = "No-Slip Chameleon Shoes" - desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. They do not work on heavily lubricated surfaces." - reference = "NOCS" - item = /obj/item/clothing/shoes/chameleon/noslip - cost = 2 - excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) - -/datum/uplink_item/stealthy_tools/syndigaloshes/nuke - reference = "NOCSN" - item = /obj/item/clothing/shoes/chameleon/noslip - cost = 4 - excludefrom = list() - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) - /datum/uplink_item/stealthy_tools/cutouts name = "Adaptive Cardboard Cutouts" desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. This pack contains three as well as a \