"
else
if(!sender_override)
@@ -38,12 +40,15 @@
announcement += " [span_alert("[html_encode(text)]")] "
announcement += " "
- var/s = sound(sound)
- for(var/mob/M in GLOB.player_list)
- if(!isnewplayer(M) && M.can_hear())
- to_chat(M, announcement)
- if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
- SEND_SOUND(M, s)
+ if(!players)
+ players = GLOB.player_list
+
+ var/sound_to_play = sound(sound)
+ for(var/mob/target in players)
+ if(!isnewplayer(target) && target.can_hear())
+ to_chat(target, announcement)
+ if(target.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
+ SEND_SOUND(target, sound_to_play)
/**
* Summon the crew for an emergency meeting
@@ -90,7 +95,7 @@
SScommunications.send_message(M)
-/proc/minor_announce(message, title = "Attention:", alert, html_encode = TRUE)
+/proc/minor_announce(message, title = "Attention:", alert, html_encode = TRUE, list/players)
if(!message)
return
@@ -98,12 +103,15 @@
title = html_encode(title)
message = html_encode(message)
- for(var/mob/M in GLOB.player_list)
- if(!isnewplayer(M) && M.can_hear())
- to_chat(M, "[span_minorannounce("[title] [message]")] ")
- if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
+ if(!players)
+ players = GLOB.player_list
+
+ for(var/mob/target in players)
+ if(!isnewplayer(target) && target.can_hear())
+ to_chat(target, "[span_minorannounce("[title] [message]")] ")
+ if(target.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
if(alert)
- SEND_SOUND(M, sound('sound/misc/notice1.ogg'))
+ SEND_SOUND(target, sound('sound/misc/notice1.ogg'))
else
SEND_SOUND(M, sound('sound/misc/notice2.ogg'))
*/
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 1ccd4a338e0..1193ad2a4bc 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -107,3 +107,12 @@ GLOBAL_LIST_INIT(construct_radial_images, list(
.[E.key_third_person] = list(E)
else
.[E.key_third_person] |= E
+
+/proc/get_crewmember_minds()
+ var/list/minds = list()
+ for(var/data in GLOB.data_core.locked)
+ var/datum/data/record/record = data
+ var/datum/mind/mind = record.fields["mindref"]
+ if(mind)
+ minds += mind
+ return minds
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index e6ce4acfb89..155ad474ec4 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -297,7 +297,7 @@ Species types : /datum/species/lizard
special keywords defined in _DEFINES/admin.dm
Example config:
{
- "Assistant" : "Don't kill everyone",
+ JOB_ASSISTANT : "Don't kill everyone",
"/datum/antagonist/highlander" : "Kill everyone",
"Ash Walker" : "Kill all spacemans"
}
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index adcef045fbe..532d7380b22 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -57,6 +57,21 @@
integer = FALSE
min_val = 0
+/// Determines the ideal player count for maximum progression per minute.
+/datum/config_entry/number/traitor_ideal_player_count
+ default = 20
+ min_val = 1
+
+/// Determines how fast traitors scale in general.
+/datum/config_entry/number/traitor_scaling_multiplier
+ default = 1
+ min_val = 0.01
+
+/// Determines how many potential objectives a traitor can have.
+/datum/config_entry/number/maximum_potential_objectives
+ default = 6
+ min_val = 1
+
/datum/config_entry/number/changeling_scaling_coeff //how much does the amount of players get divided by to determine changelings
default = 6
integer = FALSE
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
index 916e60b1c5d..14c854c6333 100644
--- a/code/controllers/subsystem/communications.dm
+++ b/code/controllers/subsystem/communications.dm
@@ -16,18 +16,50 @@ SUBSYSTEM_DEF(communications)
else
. = TRUE
-/datum/controller/subsystem/communications/proc/make_announcement(mob/living/user, is_silicon, input)
+/datum/controller/subsystem/communications/proc/make_announcement(mob/living/user, is_silicon, input, syndicate, list/players)
if(!can_announce(user, is_silicon))
return FALSE
if(is_silicon)
- minor_announce(html_decode(input),"[user.name] Announces:")
- silicon_message_cooldown = world.time + COMMUNICATION_COOLDOWN_AI
+ minor_announce(html_decode(input),"[user.name] Announces:", players = players)
+ COOLDOWN_START(src, silicon_message_cooldown, COMMUNICATION_COOLDOWN_AI)
else
- priority_announce(html_decode(user.treat_message(input)), null, ANNOUNCER_CAPTAIN, "Captain", has_important_message = TRUE) //SKYRAT EDIT CHANGE
- nonsilicon_message_cooldown = world.time + COMMUNICATION_COOLDOWN
+ priority_announce(html_decode(user.treat_message(input)), null, ANNOUNCER_CAPTAIN, "[syndicate? "Syndicate " : ""]Captain", has_important_message = TRUE, players = players)//SKYRAT EDIT CHANGE
+ COOLDOWN_START(src, nonsilicon_message_cooldown, COMMUNICATION_COOLDOWN)
user.log_talk(input, LOG_SAY, tag="priority announcement")
message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.")
+/* SKYRAT EDIT REMOVAL
+/**
+ * Check if a mob can call an emergency meeting
+ *
+ * Should only really happen during april fools.
+ * Checks to see that it's been at least 5 minutes since the last emergency meeting call.
+ * Arguments:
+ * * user - Mob who called the meeting
+ */
+/datum/controller/subsystem/communications/proc/can_make_emergency_meeting(mob/living/user)
+ if(!(SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
+ return FALSE
+ else if(COOLDOWN_FINISHED(src, emergency_meeting_cooldown))
+ return TRUE
+ else
+ return FALSE
+/**
+ * Call an emergency meeting
+ *
+ * Communications subsystem wrapper for the call_emergency_meeting world proc.
+ * Checks to make sure the proc can be called, and handles
+ * relevant logging and timing. See that proc definition for more detail.
+ * Arguments:
+ * * user - Mob who called the meeting
+ */
+/datum/controller/subsystem/communications/proc/emergency_meeting(mob/living/user)
+ if(!can_make_emergency_meeting(user))
+ return FALSE
+ call_emergency_meeting(user, get_area(user))
+ COOLDOWN_START(src, emergency_meeting_cooldown, COMMUNICATION_COOLDOWN_MEETING)
+ message_admins("[ADMIN_LOOKUPFLW(user)] has called an emergency meeting.")
+*/
/datum/controller/subsystem/communications/proc/send_message(datum/comm_message/sending,print = TRUE,unique = FALSE)
for(var/obj/machinery/computer/communications/C in GLOB.machines)
if(!(C.machine_stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index e5bd1436d59..ba0fb0ee9ba 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -153,7 +153,7 @@ SUBSYSTEM_DEF(shuttle)
supply_packs[pack.id] = pack
- initial_load()
+ setup_shuttles(stationary_docking_ports)
has_purchase_shuttle_access = init_has_purchase_shuttle_access()
if(!arrivals)
@@ -166,10 +166,9 @@ SUBSYSTEM_DEF(shuttle)
WARNING("No /obj/docking_port/mobile/supply placed on the map!")
return ..()
-/datum/controller/subsystem/shuttle/proc/initial_load()
- for(var/port in stationary_docking_ports)
- var/obj/docking_port/stationary/stationary_port = port
- stationary_port.load_roundstart()
+/datum/controller/subsystem/shuttle/proc/setup_shuttles(list/stationary)
+ for(var/obj/docking_port/stationary/port as anything in stationary)
+ port.load_roundstart()
CHECK_TICK
/datum/controller/subsystem/shuttle/fire()
diff --git a/code/controllers/subsystem/traitor.dm b/code/controllers/subsystem/traitor.dm
new file mode 100644
index 00000000000..db9e687e9ec
--- /dev/null
+++ b/code/controllers/subsystem/traitor.dm
@@ -0,0 +1,109 @@
+SUBSYSTEM_DEF(traitor)
+ name = "Traitor"
+ flags = SS_KEEP_TIMING
+ wait = 10 SECONDS
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+ /// A list of all uplink items mapped by type
+ var/list/uplink_items_by_type = list()
+ /// A list of all uplink items
+ var/list/uplink_items = list()
+
+ /// File to load configurations from.
+ var/configuration_path = "config/traitor_objective.json"
+ /// Global configuration data that gets applied to each objective when it is created.
+ /// Basic objective format
+ /// '/datum/traitor_objective/path/to/objective': {
+ /// "global_progression_influence_intensity": 0
+ /// }
+ var/configuration_data = list()
+
+ /// The coefficient multiplied by the current_global_progression for new joining traitors to calculate their progression
+ var/newjoin_progression_coeff = 0.6
+ /// The current progression that all traitors should be at in the round
+ var/current_global_progression = 0
+ /// The amount of deviance from the current global progression before you start getting 2x the current scaling or no scaling at all
+ /// Also affects objectives, so -50% progress reduction or 50% progress boost.
+ var/progression_scaling_deviance = 20 MINUTES
+ /// The current uplink handlers being managed
+ var/list/datum/uplink_handler/uplink_handlers = list()
+ /// The current scaling per minute of progression. Has a maximum value of 1 MINUTES.
+ var/current_progression_scaling = 1 MINUTES
+ /// Used to handle the probability of getting an objective.
+ var/datum/traitor_category_handler/category_handler
+ /// The current debug handler for objectives. Used for debugging objectives
+ var/datum/traitor_objective_debug/traitor_debug_panel
+ /// Used by the debug menu, decides whether newly created objectives should generate progression and telecrystals. Do not modify for non-debug purposes.
+ var/generate_objectives = TRUE
+ /// Objectives that have been completed by type. Used for limiting objectives.
+ var/list/taken_objectives_by_type = list()
+
+/datum/controller/subsystem/traitor/Initialize(start_timeofday)
+ . = ..()
+ category_handler = new()
+ traitor_debug_panel = new(category_handler)
+
+ if(fexists(configuration_path))
+ var/list/data = json_decode(file2text(file(configuration_path)))
+ for(var/typepath in data)
+ var/actual_typepath = text2path(typepath)
+ if(!actual_typepath)
+ log_world("[configuration_path] has an invalid type ([typepath]) that doesn't exist in the codebase! Please correct or remove [typepath]")
+ configuration_data[actual_typepath] = data[typepath]
+
+/datum/controller/subsystem/traitor/fire(resumed)
+ var/player_count = length(GLOB.alive_player_list)
+ // Has a maximum of 1 minute, however the value can be lower if there are lower players than the ideal
+ // player count for a traitor to be threatening. Rounds to the nearest 10% of a minute to prevent weird
+ // values from appearing in the UI. Traitor scaling multiplier bypasses the limit and only multiplies the end value.
+ // from all of our calculations.
+ current_progression_scaling = max(min(
+ (player_count / CONFIG_GET(number/traitor_ideal_player_count)) * 1 MINUTES,
+ 1 MINUTES
+ ), 0.1 MINUTES) * CONFIG_GET(number/traitor_scaling_multiplier)
+
+ var/progression_scaling_delta = (wait / (1 MINUTES)) * current_progression_scaling
+ var/previous_global_progression = current_global_progression
+
+ current_global_progression += progression_scaling_delta
+ for(var/datum/uplink_handler/handler in uplink_handlers)
+ if(!handler.has_progression || QDELETED(handler))
+ uplink_handlers -= handler
+ var/deviance = (previous_global_progression - handler.progression_points) / progression_scaling_deviance
+ if(abs(deviance) < 0.01)
+ // If deviance is less than 1%, just set them to the current global progression
+ // Prevents problems with precision errors.
+ handler.progression_points = current_global_progression
+ else
+ var/amount_to_give = progression_scaling_delta + (progression_scaling_delta * deviance)
+ amount_to_give = clamp(amount_to_give, 0, progression_scaling_delta * 2)
+ handler.progression_points += amount_to_give
+ handler.update_objectives()
+ handler.on_update()
+
+/datum/controller/subsystem/traitor/proc/register_uplink_handler(datum/uplink_handler/uplink_handler)
+ if(!uplink_handler.has_progression)
+ return
+ uplink_handlers |= uplink_handler
+ // An uplink handler can be registered multiple times if they get assigned to new uplinks, so
+ // override is set to TRUE here because it is intentional that they could get added multiple times.
+ RegisterSignal(uplink_handler, COMSIG_PARENT_QDELETING, .proc/uplink_handler_deleted, override = TRUE)
+
+/datum/controller/subsystem/traitor/proc/uplink_handler_deleted(datum/uplink_handler/uplink_handler)
+ SIGNAL_HANDLER
+ uplink_handlers -= uplink_handler
+
+/datum/controller/subsystem/traitor/proc/on_objective_taken(datum/traitor_objective/objective)
+ if(!istype(objective))
+ return
+
+ var/datum/traitor_objective/current_type = objective.type
+ while(current_type != /datum/traitor_objective)
+ if(!taken_objectives_by_type[current_type])
+ taken_objectives_by_type[current_type] = list(objective)
+ else
+ taken_objectives_by_type[current_type] += objective
+ current_type = type2parent(current_type)
+
+/datum/controller/subsystem/traitor/proc/get_taken_count(datum/traitor_objective/objective_type)
+ return length(taken_objectives_by_type[objective_type])
diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm
index 92852febcbf..0d26b6ef456 100644
--- a/code/datums/brain_damage/imaginary_friend.dm
+++ b/code/datums/brain_damage/imaginary_friend.dm
@@ -138,7 +138,7 @@
highest_pref = this_pref
if(!appearance_job)
- appearance_job = SSjob.GetJob("Assistant")
+ appearance_job = SSjob.GetJob(JOB_ASSISTANT)
if(istype(appearance_job, /datum/job/ai))
human_image = icon('icons/mob/ai.dmi', icon_state = resolve_ai_icon(appearance_from_prefs.read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH)
diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm
index a9f8d2f0970..170ceab5ee1 100644
--- a/code/datums/components/uplink.dm
+++ b/code/datums/components/uplink.dm
@@ -9,32 +9,40 @@
**/
/datum/component/uplink
dupe_mode = COMPONENT_DUPE_UNIQUE
+ /// Name of the uplink
var/name = "syndicate uplink"
+ /// Whether the uplink is currently active or not
var/active = FALSE
+ /// Whether this uplink can be locked or not
var/lockable = TRUE
+ /// Whether the uplink is locked or not.
var/locked = TRUE
+ /// Whether this uplink allows restricted items to be accessed
var/allow_restricted = TRUE
- var/telecrystals
- var/selected_cat
+ /// Current owner of the uplink
var/owner = null
- var/uplink_flag
+ /// Purchase log, listing all the purchases this uplink has made
var/datum/uplink_purchase_log/purchase_log
- var/list/uplink_items
- var/hidden_crystals = 0
- var/unlock_note
+ /// The current linked uplink handler.
+ var/datum/uplink_handler/uplink_handler
+ /// Code to unlock the uplink.
var/unlock_code
- var/failsafe_code
- var/compact_mode = FALSE
- var/debug = FALSE
- ///Instructions on how to access the uplink based on location
- var/unlock_text
+ /// Used for pen uplink
var/list/previous_attempts
-/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, uplink_flag = UPLINK_TRAITORS, starting_tc = TELECRYSTALS_DEFAULT)
+ // Not modular variables. These variables should be removed sometime in the future
+
+ /// The unlock text that is sent to the traitor with this uplink. This is not modular and not recommended to expand upon
+ var/unlock_text
+ /// The unlock note that is sent to the traitor with this uplink. This is not modular and not recommended to expand upon
+ var/unlock_note
+ /// The failsafe code that causes this uplink to blow up.
+ var/failsafe_code
+
+/datum/component/uplink/Initialize(owner, lockable = TRUE, enabled = FALSE, uplink_flag = UPLINK_TRAITORS, starting_tc = TELECRYSTALS_DEFAULT, has_progression = FALSE, datum/uplink_handler/uplink_handler_override)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
-
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
if(istype(parent, /obj/item/implant))
@@ -49,96 +57,67 @@
RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency)
else if(istype(parent, /obj/item/pen))
RegisterSignal(parent, COMSIG_PEN_ROTATED, .proc/pen_rotation)
- if(_owner)
- owner = _owner
+ if(owner)
+ src.owner = owner
LAZYINITLIST(GLOB.uplink_purchase_logs_by_key)
if(GLOB.uplink_purchase_logs_by_key[owner])
purchase_log = GLOB.uplink_purchase_logs_by_key[owner]
else
purchase_log = new(owner, src)
- lockable = _lockable
- active = _enabled
- src.uplink_flag = uplink_flag
- update_items()
- telecrystals = starting_tc
+ src.lockable = lockable
+ src.active = enabled
+ if(!uplink_handler_override)
+ uplink_handler = new()
+ uplink_handler.has_objectives = FALSE
+ uplink_handler.uplink_flag = uplink_flag
+ uplink_handler.telecrystals = starting_tc
+ uplink_handler.has_progression = has_progression
+ uplink_handler.purchase_log = purchase_log
+ else
+ uplink_handler = uplink_handler_override
+ RegisterSignal(uplink_handler, COMSIG_UPLINK_HANDLER_ON_UPDATE, .proc/handle_uplink_handler_update)
if(!lockable)
active = TRUE
locked = FALSE
previous_attempts = list()
-/datum/component/uplink/InheritComponent(datum/component/uplink/U)
- lockable |= U.lockable
- active |= U.active
- uplink_flag |= U.uplink_flag
- telecrystals += U.telecrystals
- if(purchase_log && U.purchase_log)
- purchase_log.MergeWithAndDel(U.purchase_log)
+/datum/component/uplink/proc/handle_uplink_handler_update()
+ SIGNAL_HANDLER
+ SStgui.update_uis(src)
+
+/// Adds telecrystals to the uplink. It is bad practice to use this outside of the component itself.
+/datum/component/uplink/proc/add_telecrystals(telecrystals_added)
+ set_telecrystals(uplink_handler.telecrystals + telecrystals_added)
+
+/// Sets the telecrystals of the uplink. It is bad practice to use this outside of the component itself.
+/datum/component/uplink/proc/set_telecrystals(new_telecrystal_amount)
+ uplink_handler.telecrystals = new_telecrystal_amount
+
+/datum/component/uplink/InheritComponent(datum/component/uplink/uplink)
+ lockable |= uplink.lockable
+ active |= uplink.active
+ uplink_handler.uplink_flag |= uplink.uplink_handler.uplink_flag
/datum/component/uplink/Destroy()
purchase_log = null
return ..()
-/datum/component/uplink/proc/update_items(user)
- var/updated_items
- updated_items = get_uplink_items(uplink_flag, TRUE, allow_restricted)
- update_sales(updated_items)
- update_special_equipment(user, updated_items)
- uplink_items = updated_items
-
-/datum/component/uplink/proc/update_sales(updated_items)
- var/discount_categories = list("Discounted Gear", "Discounted Team Gear", "Limited Stock Team Gear")
- if (uplink_items == null)
- return
- for (var/category in discount_categories) // Makes sure discounted items aren't renewed or replaced
- if (uplink_items[category] != null && updated_items[category] != null)
- updated_items[category] = uplink_items[category]
-
-/datum/component/uplink/proc/update_special_equipment(mob/user, updated_items)
- if(!user?.mind?.failed_special_equipment)
- return
- for(var/obj/item/equipment_path as anything in user.mind.failed_special_equipment)
- var/datum/uplink_item/special_equipment/equipment_uplink_item = new
- if(!updated_items[equipment_uplink_item.category])
- updated_items[equipment_uplink_item.category] = list()
- var/list/name_words = splittext(initial(equipment_path.name), " ")
- var/capitalized_name
- for(var/i in 1 to name_words.len)
- name_words[i] = capitalize(name_words[i])
- capitalized_name = name_words.Join(" ")
- equipment_uplink_item.item = equipment_path
- equipment_uplink_item.name = capitalized_name
- equipment_uplink_item.desc = initial(equipment_path.desc)
- updated_items[equipment_uplink_item.category][equipment_uplink_item.name] = equipment_uplink_item
-
-/datum/component/uplink/proc/LoadTC(mob/user, obj/item/stack/telecrystal/TC, silent = FALSE)
+/datum/component/uplink/proc/load_tc(mob/user, obj/item/stack/telecrystal/telecrystals, silent = FALSE)
if(!silent)
- to_chat(user, span_notice("You slot [TC] into [parent] and charge its internal uplink."))
- var/amt = TC.amount
- telecrystals += amt
- TC.use(amt)
+ to_chat(user, span_notice("You slot [telecrystals] into [parent] and charge its internal uplink."))
+ var/amt = telecrystals.amount
+ uplink_handler.telecrystals += amt
+ telecrystals.use(amt)
log_uplink("[key_name(user)] loaded [amt] telecrystals into [parent]'s uplink")
-/datum/component/uplink/proc/OnAttackBy(datum/source, obj/item/I, mob/user)
+/datum/component/uplink/proc/OnAttackBy(datum/source, obj/item/item, mob/user)
SIGNAL_HANDLER
-
if(!active)
return //no hitting everyone/everything just to try to slot tcs in!
- if(istype(I, /obj/item/stack/telecrystal))
- LoadTC(user, I)
- for(var/category in uplink_items)
- for(var/item in uplink_items[category])
- var/datum/uplink_item/UI = uplink_items[category][item]
- var/path = UI.refund_path || UI.item
- var/cost = UI.refund_amount || UI.cost
- if(I.type == path && UI.refundable && I.check_uplink_validity())
- telecrystals += cost
- log_uplink("[key_name(user)] refunded [UI] for [cost] telecrystals using [parent]'s uplink")
- if(purchase_log)
- purchase_log.total_spent -= cost
- to_chat(user, span_notice("[I] refunded."))
- qdel(I)
- return
+
+ if(istype(item, /obj/item/stack/telecrystal))
+ load_tc(user, item)
/datum/component/uplink/proc/interact(datum/source, mob/user)
SIGNAL_HANDLER
@@ -146,7 +125,6 @@
if(locked)
return
active = TRUE
- update_items(user)
if(user)
INVOKE_ASYNC(src, .proc/ui_interact, user)
// an unlocked uplink blocks also opening the PDA or headset menu
@@ -170,44 +148,75 @@
if(!user.mind)
return
var/list/data = list()
- data["telecrystals"] = telecrystals
- data["lockable"] = lockable
- data["compactMode"] = compact_mode
+ data["telecrystals"] = uplink_handler.telecrystals
+ data["progression_points"] = uplink_handler.progression_points
+ data["current_expected_progression"] = SStraitor.current_global_progression
+ data["maximum_active_objectives"] = uplink_handler.maximum_active_objectives
+ data["progression_scaling_deviance"] = SStraitor.progression_scaling_deviance
+ data["current_progression_scaling"] = SStraitor.current_progression_scaling
+
+ data["maximum_potential_objectives"] = uplink_handler.maximum_potential_objectives
+ if(uplink_handler.has_objectives)
+ var/list/potential_objectives = list()
+ for(var/index in 1 to uplink_handler.potential_objectives.len)
+ var/datum/traitor_objective/objective = uplink_handler.potential_objectives[index]
+ var/list/objective_data = objective.uplink_ui_data(user)
+ objective_data["id"] = index
+ potential_objectives += list(objective_data)
+ var/list/active_objectives = list()
+ for(var/index in 1 to uplink_handler.active_objectives.len)
+ var/datum/traitor_objective/objective = uplink_handler.active_objectives[index]
+ var/list/objective_data = objective.uplink_ui_data(user)
+ objective_data["id"] = index
+ active_objectives += list(objective_data)
+ data["potential_objectives"] = potential_objectives
+ data["active_objectives"] = active_objectives
+
+ var/list/stock_list = uplink_handler.item_stock.Copy()
+ var/list/extra_purchasable_stock = list()
+ var/list/extra_purchasable = list()
+ for(var/datum/uplink_item/item as anything in uplink_handler.extra_purchasable)
+ if(item in stock_list)
+ extra_purchasable_stock[REF(item)] = stock_list[item]
+ stock_list -= item
+ extra_purchasable += list(list(
+ "id" = item.type,
+ "name" = item.name,
+ "cost" = item.cost,
+ "desc" = item.desc,
+ "category" = item.category? initial(item.category.name) : null,
+ "purchasable_from" = item.purchasable_from,
+ "restricted" = item.restricted,
+ "limited_stock" = item.limited_stock,
+ "restricted_roles" = item.restricted_roles,
+ "progression_minimum" = item.progression_minimum,
+ "ref" = REF(item)
+ ))
+
+ var/list/remaining_stock = list()
+ for(var/datum/uplink_item/item as anything in stock_list)
+ remaining_stock[item.type] = stock_list[item]
+ data["extra_purchasable"] = extra_purchasable
+ data["extra_purchasable_stock"] = extra_purchasable_stock
+ data["current_stock"] = remaining_stock
return data
/datum/component/uplink/ui_static_data(mob/user)
var/list/data = list()
- data["categories"] = list()
- for(var/category in uplink_items)
- var/list/cat = list(
- "name" = category,
- "items" = (category == selected_cat ? list() : null))
- for(var/item in uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
- if(I.limited_stock == 0)
- continue
- if(length(I.restricted_roles))
- if(!debug && !(user.mind.assigned_role.title in I.restricted_roles))
- continue
- if(I.restricted_species)
- if(ishuman(user))
- var/is_inaccessible = TRUE
- var/mob/living/carbon/human/H = user
- for(var/F in I.restricted_species)
- if(F == H.dna.species.id || debug)
- is_inaccessible = FALSE
- break
- if(is_inaccessible)
- continue
- cat["items"] += list(list(
- "name" = I.name,
- "cost" = I.cost,
- "desc" = I.desc,
- ))
- data["categories"] += list(cat)
+ data["uplink_flag"] = uplink_handler.uplink_flag
+ data["has_progression"] = uplink_handler.has_progression
+ data["has_objectives"] = uplink_handler.has_objectives
+ data["lockable"] = lockable
+ data["assigned_role"] = uplink_handler.assigned_role
+ data["debug"] = uplink_handler.debug_mode
return data
-/datum/component/uplink/ui_act(action, params)
+/datum/component/uplink/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/json/uplink)
+ )
+
+/datum/component/uplink/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -215,49 +224,63 @@
return
switch(action)
if("buy")
- var/item_name = params["name"]
- var/list/buyable_items = list()
- for(var/category in uplink_items)
- buyable_items += uplink_items[category]
- if(item_name in buyable_items)
- var/datum/uplink_item/I = buyable_items[item_name]
- MakePurchase(usr, I)
- return TRUE
+ var/datum/uplink_item/item
+ if(params["ref"])
+ item = locate(params["ref"]) in uplink_handler.extra_purchasable
+ if(!item)
+ return
+ else
+ var/datum/uplink_item/item_path = text2path(params["path"])
+ if(!ispath(item_path, /datum/uplink_item))
+ return
+ item = SStraitor.uplink_items_by_type[item_path]
+ uplink_handler.purchase_item(ui.user, item)
if("lock")
active = FALSE
locked = TRUE
- telecrystals += hidden_crystals
- hidden_crystals = 0
SStgui.close_uis(src)
- if("select")
- selected_cat = params["category"]
- return TRUE
- if("compact_toggle")
- compact_mode = !compact_mode
+
+ if(!uplink_handler.has_objectives)
+ return TRUE
+
+ if(uplink_handler.owner?.current != ui.user || !uplink_handler.can_take_objectives)
+ return TRUE
+
+ switch(action)
+ if("regenerate_objectives")
+ uplink_handler.generate_objectives()
return TRUE
-/datum/component/uplink/proc/MakePurchase(mob/user, datum/uplink_item/U)
- if(!istype(U))
- return
- if (!user || user.incapacitated())
- return
- if(U.restricted_roles.len && !(user.mind.assigned_role.title in U.restricted_roles))
+ var/list/objectives
+ switch(action)
+ if("start_objective")
+ objectives = uplink_handler.potential_objectives
+ if("objective_act", "finish_objective", "objective_abort")
+ objectives = uplink_handler.active_objectives
+
+ if(!objectives)
return
- if(telecrystals < U.cost || U.limited_stock == 0)
- return
- telecrystals -= U.cost
+ var/objective_index = round(text2num(params["index"]))
+ if(objective_index < 1 || objective_index > length(objectives))
+ return TRUE
+ var/datum/traitor_objective/objective = objectives[objective_index]
- U.purchase(user, src)
-
- if(U.limited_stock > 0)
- U.limited_stock -= 1
-
- SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(U.name)]", "[U.cost]"))
+ // Objective actions
+ switch(action)
+ if("start_objective")
+ uplink_handler.take_objective(ui.user, objective)
+ if("objective_act")
+ uplink_handler.ui_objective_act(ui.user, objective, params["objective_action"])
+ if("finish_objective")
+ if(!objective.finish_objective(ui.user))
+ return
+ uplink_handler.complete_objective(objective)
+ if("objective_abort")
+ uplink_handler.abort_objective(objective)
return TRUE
// Implant signal responses
-
/datum/component/uplink/proc/implant_activation()
SIGNAL_HANDLER
@@ -286,7 +309,7 @@
/datum/component/uplink/proc/new_implant(datum/source, datum/component/uplink/uplink)
SIGNAL_HANDLER
- uplink.telecrystals += telecrystals
+ uplink.add_telecrystals(uplink_handler.telecrystals)
return COMPONENT_DELETE_NEW_IMPLANT
// PDA signal responses
diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm
index aa03514b6b1..995741e24b8 100644
--- a/code/datums/id_trim/syndicate.dm
+++ b/code/datums/id_trim/syndicate.dm
@@ -12,7 +12,7 @@
/// Trim for Syndicate mobs, outfits and corpses.
/datum/id_trim/syndicom/captain
assignment = "Syndicate Ship Captain"
- access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS)
+ access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_ROBOTICS)
/// Trim for Syndicate mobs, outfits and corpses.
/datum/id_trim/battlecruiser
@@ -23,7 +23,7 @@
/// Trim for Syndicate mobs, outfits and corpses.
/datum/id_trim/battlecruiser/captain
assignment = "Syndicate Battlecruiser Captain"
- access = SYNDICATE_ACCESS
+ access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER)
/// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards.
/datum/id_trim/chameleon
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 23ef37b66fa..e98fd398496 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -632,14 +632,47 @@
wipe_memory()//Remove any memory they may have had.
log_admin("[key_name(usr)] removed [current]'s uplink.")
if("crystals")
- if(check_rights(R_FUN, 0))
+ if(check_rights(R_FUN))
var/datum/component/uplink/U = find_syndicate_uplink()
if(U)
- var/crystals = input("Amount of telecrystals for [key]","Syndicate uplink", U.telecrystals) as null | num
+ var/crystals = input("Amount of telecrystals for [key]","Syndicate uplink", U.uplink_handler.telecrystals) as null | num
if(!isnull(crystals))
- U.telecrystals = crystals
+ U.uplink_handler.telecrystals = crystals
message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].")
log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].")
+ if("progression")
+ if(!check_rights(R_FUN))
+ return
+ var/datum/component/uplink/uplink = find_syndicate_uplink()
+ if(!uplink)
+ return
+ var/progression = input("Set new progression points for [key]","Syndicate uplink", uplink.uplink_handler.progression_points) as null | num
+ if(isnull(progression))
+ return
+ uplink.uplink_handler.progression_points = progression
+ message_admins("[key_name_admin(usr)] changed [current]'s progression point count to [progression].")
+ log_admin("[key_name(usr)] changed [current]'s progression point count to [progression].")
+ uplink.uplink_handler.update_objectives()
+ uplink.uplink_handler.generate_objectives()
+ if("give_objective")
+ if(!check_rights(R_FUN))
+ return
+ var/datum/component/uplink/uplink = find_syndicate_uplink()
+ if(!uplink || !uplink.uplink_handler)
+ return
+ var/list/all_objectives = subtypesof(/datum/traitor_objective)
+ var/objective_typepath = tgui_input_list(usr, "Select objective", "Select objective", all_objectives)
+ if(!objective_typepath)
+ return
+ var/datum/traitor_objective/objective = uplink.uplink_handler.try_add_objective(objective_typepath)
+ if(objective)
+ message_admins("[key_name_admin(usr)] gave [current] a traitor objective ([objective_typepath]).")
+ log_admin("[key_name(usr)] gave [current] a traitor objective ([objective_typepath]).")
+ objective.forced = TRUE
+ else
+ to_chat(usr, span_warning("Failed to generate the objective!"))
+ message_admins("[key_name_admin(usr)] failed to give [current] a traitor objective ([objective_typepath]).")
+ log_admin("[key_name(usr)] failed to give [current] a traitor objective ([objective_typepath]).")
if("uplink")
if(!give_uplink(antag_datum = has_antag_datum(/datum/antagonist/traitor)))
to_chat(usr, span_danger("Equipping a syndicate failed!"))
@@ -699,10 +732,6 @@
if(!(has_antag_datum(/datum/antagonist/traitor)))
add_antag_datum(/datum/antagonist/traitor)
-/datum/mind/proc/make_contractor_support()
- if(!(has_antag_datum(/datum/antagonist/traitor/contractor_support)))
- add_antag_datum(/datum/antagonist/traitor/contractor_support)
-
/datum/mind/proc/make_changeling()
var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
if(!C)
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 602d41484f5..201714d063c 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -697,6 +697,26 @@
suffix = "bounty"
name = "Bounty Hunter Ship"
+/datum/map_template/shuttle/starfury
+ port_id = "starfury"
+ who_can_purchase = null
+
+/datum/map_template/shuttle/starfury/fighter_one
+ suffix = "fighter1"
+ name = "SBC Starfury Fighter (1)"
+
+/datum/map_template/shuttle/starfury/fighter_two
+ suffix = "fighter2"
+ name = "SBC Starfury Fighter (2)"
+
+/datum/map_template/shuttle/starfury/fighter_three
+ suffix = "fighter3"
+ name = "SBC Starfury Fighter (3)"
+
+/datum/map_template/shuttle/starfury/corvette
+ suffix = "corvette"
+ name = "SBC Starfury Corvette"
+
/datum/map_template/shuttle/ruin/caravan_victim
suffix = "caravan_victim"
name = "Small Freighter"
diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
index 29967e7c0d3..9734dc680cd 100644
--- a/code/game/area/areas/shuttles.dm
+++ b/code/game/area/areas/shuttles.dm
@@ -192,6 +192,9 @@
/area/shuttle/sbc_fighter2
name = "SBC Fighter 2"
+/area/shuttle/sbc_fighter3
+ name = "SBC Fighter 3"
+
/area/shuttle/sbc_corvette
name = "SBC corvette"
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index b2dc5b89a9f..2f11149ce67 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -730,7 +730,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(CONFIG_GET(flag/protect_roles_from_antagonist))
ruleset.restricted_roles |= ruleset.protected_roles
if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- ruleset.restricted_roles |= "Assistant"
+ ruleset.restricted_roles |= JOB_ASSISTANT
/// Refund threat, but no more than threat_level.
/datum/game_mode/dynamic/proc/refund_threat(regain)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 33b0d50ff98..b075564780c 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -103,14 +103,6 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION
/datum/objective/proc/get_target()
return target
-/datum/objective/proc/get_crewmember_minds()
- . = list()
- for(var/V in GLOB.data_core.locked)
- var/datum/data/record/R = V
- var/datum/mind/M = R.fields["mindref"]
- if(M)
- . += M
-
//dupe_search_range is a list of antag datums / minds / teams
/datum/objective/proc/find_target(dupe_search_range, blacklist)
var/list/datum/mind/owners = get_owners()
@@ -582,6 +574,8 @@ GLOBAL_LIST_EMPTY(possible_items)
var/approved_targets = list()
check_items:
for(var/datum/objective_item/possible_item in GLOB.possible_items)
+ if(possible_item.objective_type != OBJECTIVE_ITEM_TYPE_NORMAL)
+ continue
if(!is_unique_objective(possible_item.targetitem,dupe_search_range))
continue
for(var/datum/mind/M in owners)
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 433d2a2a03a..a738464dbbf 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -3,10 +3,14 @@
/datum/objective_item
var/name = "A silly bike horn! Honk!"
var/targetitem = /obj/item/bikehorn //typepath of the objective item
+ var/list/valid_containers = list() // Valid containers that the target item can be in.
var/difficulty = 9001 //vaguely how hard it is to do this objective
var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc)
var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints)
var/list/special_equipment = list()
+ var/objective_type = OBJECTIVE_ITEM_TYPE_NORMAL
+ /// Whether this item exists on the station map at the start of a round.
+ var/exists_on_map = FALSE
/datum/objective_item/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc)
return 1
@@ -25,50 +29,140 @@
GLOB.possible_items -= src
return ..()
+// Low risk steal objectives
+/datum/objective_item/steal/low_risk
+ objective_type = OBJECTIVE_ITEM_TYPE_TRAITOR
+
+/datum/objective_item/steal/low_risk/techboard
+ name = "the (TECH BOARD) circuitboard in secure tech storage"
+ var/circuitboard_name
+ excludefromjob = list(
+ JOB_CAPTAIN,
+ JOB_CHIEF_ENGINEER,
+ JOB_RESEARCH_DIRECTOR,
+ )
+ exists_on_map = TRUE
+
+/datum/objective_item/steal/low_risk/techboard/aiupload
+ targetitem = /obj/item/circuitboard/computer/aiupload
+ circuitboard_name = "ai upload"
+
+/datum/objective_item/steal/low_risk/techboard/borgupload
+ targetitem = /obj/item/circuitboard/computer/borgupload
+ circuitboard_name = "cyborg upload"
+
+/datum/objective_item/steal/low_risk/techboard/New()
+ . = ..()
+ name = replacetext(name, "(TECH BOARD)", circuitboard_name)
+
+/datum/objective_item/steal/low_risk/aicard
+ targetitem = /obj/item/aicard
+ name = "an intelliCard"
+ excludefromjob = list(
+ JOB_CAPTAIN,
+ JOB_CHIEF_ENGINEER,
+ JOB_RESEARCH_DIRECTOR,
+ JOB_CHIEF_MEDICAL_OFFICER,
+ JOB_HEAD_OF_SECURITY,
+ JOB_STATION_ENGINEER,
+ JOB_SCIENTIST,
+ JOB_ATMOSPHERIC_TECHNICIAN,
+ )
+ exists_on_map = TRUE
+
+// Unique-ish low risk objectives
+/datum/objective_item/steal/low_risk/bartender_shotgun
+ name = "the bartender's shotgun"
+ targetitem = /obj/item/gun/ballistic/shotgun/doublebarrel
+ excludefromjob = list(JOB_BARTENDER)
+ exists_on_map = TRUE
+
+/datum/objective_item/steal/low_risk/fireaxe
+ name = "a fire axe"
+ targetitem = /obj/item/fireaxe
+ excludefromjob = list(JOB_CHIEF_ENGINEER,JOB_STATION_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN)
+ exists_on_map = TRUE
+
+/datum/objective_item/steal/low_risk/nullrod
+ name = "the chaplain's null rod"
+ targetitem = /obj/item/nullrod
+ excludefromjob = list(JOB_CHAPLAIN)
+ exists_on_map = TRUE
+
+/datum/objective_item/steal/low_risk/clown_shoes
+ name = "the clown's shoes"
+ targetitem = /obj/item/clothing/shoes/clown_shoes
+ excludefromjob = list(JOB_CLOWN, JOB_CARGO_TECHNICIAN, JOB_QUARTERMASTER)
+
+/datum/objective_item/steal/low_risk/clown_shoes/TargetExists()
+ for(var/mob/player as anything in GLOB.player_list)
+ if(player.stat == DEAD)
+ continue
+ if(player.job != JOB_CLOWN)
+ continue
+ if(is_centcom_level(player.z))
+ continue
+ return TRUE
+ return FALSE
+
+/datum/objective_item/steal/low_risk/cargo_budget
+ name = "cargo's departmental budget"
+ targetitem = /obj/item/card/id/departmental_budget/car
+ excludefromjob = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN)
+ exists_on_map = TRUE
+
+// High risk steal objectives
/datum/objective_item/steal/caplaser
- name = "the captain's antique laser gun."
+ name = "the captain's antique laser gun"
targetitem = /obj/item/gun/energy/laser/captain
difficulty = 5
excludefromjob = list(JOB_CAPTAIN)
+ exists_on_map = TRUE
/datum/objective_item/steal/hoslaser
- name = "the head of security's personal laser gun."
+ name = "the head of security's personal laser gun"
targetitem = /obj/item/gun/energy/e_gun/hos
difficulty = 10
excludefromjob = list(JOB_HEAD_OF_SECURITY)
+ exists_on_map = TRUE
/datum/objective_item/steal/handtele
- name = "a hand teleporter."
+ name = "a hand teleporter"
targetitem = /obj/item/hand_tele
difficulty = 5
excludefromjob = list(JOB_CAPTAIN, JOB_RESEARCH_DIRECTOR)
+ exists_on_map = TRUE
/datum/objective_item/steal/jetpack
- name = "the Captain's jetpack."
+ name = "the Captain's jetpack"
targetitem = /obj/item/tank/jetpack/oxygen/captain
difficulty = 5
excludefromjob = list(JOB_CAPTAIN)
+ exists_on_map = TRUE
/datum/objective_item/steal/magboots
- name = "the chief engineer's advanced magnetic boots."
+ name = "the chief engineer's advanced magnetic boots"
targetitem = /obj/item/clothing/shoes/magboots/advance
difficulty = 5
excludefromjob = list(JOB_CHIEF_ENGINEER)
+ exists_on_map = TRUE
/datum/objective_item/steal/capmedal
- name = "the medal of captaincy."
+ name = "the medal of captaincy"
targetitem = /obj/item/clothing/accessory/medal/gold/captain
difficulty = 5
excludefromjob = list(JOB_CAPTAIN)
+ exists_on_map = TRUE
/datum/objective_item/steal/hypo
- name = "the hypospray."
+ name = "the hypospray"
targetitem = /obj/item/reagent_containers/hypospray/cmo
difficulty = 5
excludefromjob = list(JOB_CHIEF_MEDICAL_OFFICER)
+ exists_on_map = TRUE
/datum/objective_item/steal/nukedisc
- name = "the nuclear authentication disk."
+ name = "the nuclear authentication disk"
targetitem = /obj/item/disk/nuclear
difficulty = 5
excludefromjob = list(JOB_CAPTAIN)
@@ -77,36 +171,42 @@
return !N.fake
/datum/objective_item/steal/reflector
- name = "a reflector trenchcoat."
+ name = "a reflector trenchcoat"
targetitem = /obj/item/clothing/suit/hooded/ablative
difficulty = 3
excludefromjob = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN)
+ exists_on_map = TRUE
/datum/objective_item/steal/reactive
- name = "the reactive teleport armor."
+ name = "the reactive teleport armor"
targetitem = /obj/item/clothing/suit/armor/reactive/teleport
difficulty = 5
excludefromjob = list(JOB_RESEARCH_DIRECTOR)
+ exists_on_map = TRUE
/datum/objective_item/steal/documents
- name = "any set of secret documents of any organization."
+ name = "any set of secret documents of any organization"
targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
difficulty = 5
+ exists_on_map = TRUE
/datum/objective_item/steal/nuke_core
- name = "the heavily radioactive plutonium core from the onboard self-destruct. Take care to wear the proper safety equipment when extracting the core!"
+ name = "the heavily radioactive plutonium core from the onboard self-destruct"
+ valid_containers = list(/obj/item/nuke_core_container)
targetitem = /obj/item/nuke_core
difficulty = 15
+ exists_on_map = TRUE
/datum/objective_item/steal/nuke_core/New()
special_equipment += /obj/item/storage/box/syndie_kit/nuke
..()
/datum/objective_item/steal/hdd_extraction
- name = "the source code for Project Goon from the master R&D server mainframe."
+ name = "the source code for Project Goon from the master R&D server mainframe"
targetitem = /obj/item/computer_hardware/hard_drive/cluster/hdd_theft
difficulty = 10
excludefromjob = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST)
+ exists_on_map = TRUE
/datum/objective_item/steal/hdd_extraction/New()
special_equipment += /obj/item/paper/guides/antag/hdd_extraction
@@ -114,8 +214,9 @@
/datum/objective_item/steal/supermatter
- name = "a sliver of a supermatter crystal. Be sure to use the proper safety equipment when extracting the sliver!"
+ name = "a sliver of a supermatter crystal"
targetitem = /obj/item/nuke_core/supermatter_sliver
+ valid_containers = list(/obj/item/nuke_core_container/supermatter)
difficulty = 15
/datum/objective_item/steal/supermatter/New()
@@ -127,7 +228,7 @@
//Items with special checks!
/datum/objective_item/steal/plasma
- name = "28 moles of plasma (full tank)."
+ name = "28 moles of plasma (full tank)"
targetitem = /obj/item/tank
difficulty = 3
excludefromjob = list(
@@ -144,7 +245,7 @@
/datum/objective_item/steal/functionalai
- name = "a functional AI."
+ name = "a functional AI"
targetitem = /obj/item/aicard
difficulty = 20 //beyond the impossible
@@ -155,11 +256,12 @@
return FALSE
/datum/objective_item/steal/blueprints
- name = "the station blueprints."
+ name = "the station blueprints"
targetitem = /obj/item/areaeditor/blueprints
difficulty = 10
excludefromjob = list(JOB_CHIEF_ENGINEER)
altitems = list(/obj/item/photo)
+ exists_on_map = TRUE
/datum/objective_item/steal/blueprints/check_special_completion(obj/item/I)
if(istype(I, /obj/item/areaeditor/blueprints))
@@ -171,7 +273,7 @@
return FALSE
/datum/objective_item/steal/slime
- name = "an unused sample of slime extract."
+ name = "an unused sample of slime extract"
targetitem = /obj/item/slime_extract
difficulty = 3
excludefromjob = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST)
@@ -182,10 +284,11 @@
return 0
/datum/objective_item/steal/blackbox
- name = "The Blackbox."
+ name = "the Blackbox"
targetitem = /obj/item/blackbox
difficulty = 10
excludefromjob = list(JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN)
+ exists_on_map = TRUE
//Unique Objectives
/datum/objective_item/special/New()
@@ -201,37 +304,38 @@
//Old ninja objectives.
/datum/objective_item/special/pinpointer
- name = "the captain's pinpointer."
+ name = "the captain's pinpointer"
targetitem = /obj/item/pinpointer/nuke
difficulty = 10
+ exists_on_map = TRUE
/datum/objective_item/special/aegun
- name = "an advanced energy gun."
+ name = "an advanced energy gun"
targetitem = /obj/item/gun/energy/e_gun/nuclear
difficulty = 10
/datum/objective_item/special/ddrill
- name = "a diamond drill."
+ name = "a diamond drill"
targetitem = /obj/item/pickaxe/drill/diamonddrill
difficulty = 10
/datum/objective_item/special/boh
- name = "a bag of holding."
+ name = "a bag of holding"
targetitem = /obj/item/storage/backpack/holding
difficulty = 10
/datum/objective_item/special/hypercell
- name = "a hyper-capacity power cell."
+ name = "a hyper-capacity power cell"
targetitem = /obj/item/stock_parts/cell/hyper
difficulty = 5
/datum/objective_item/special/laserpointer
- name = "a laser pointer."
+ name = "a laser pointer"
targetitem = /obj/item/laser_pointer
difficulty = 5
/datum/objective_item/special/corgimeat
- name = "a piece of corgi meat."
+ name = "a piece of corgi meat"
targetitem = /obj/item/food/meat/slab/corgi
difficulty = 5
@@ -248,7 +352,7 @@
//Stack objectives get their own subtype
/datum/objective_item/stack
- name = "5 cardboard."
+ name = "5 cardboard"
targetitem = /obj/item/stack/sheet/cardboard
difficulty = 9001
@@ -261,16 +365,16 @@
return found_amount>=target_amount
/datum/objective_item/stack/diamond
- name = "10 diamonds."
+ name = "10 diamonds"
targetitem = /obj/item/stack/sheet/mineral/diamond
difficulty = 10
/datum/objective_item/stack/gold
- name = "50 gold bars."
+ name = "50 gold bars"
targetitem = /obj/item/stack/sheet/mineral/gold
difficulty = 15
/datum/objective_item/stack/uranium
- name = "25 refined uranium bars."
+ name = "25 refined uranium bars"
targetitem = /obj/item/stack/sheet/mineral/uranium
difficulty = 10
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 80eaa863834..08f535beb43 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -24,10 +24,16 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
circuit = /obj/item/circuitboard/computer/communications
light_color = LIGHT_COLOR_BLUE
+ /// If the battlecruiser has been called
+ var/static/battlecruiser_called = FALSE
+
/// Cooldown for important actions, such as messaging CentCom or other sectors
COOLDOWN_DECLARE(static/important_action_cooldown)
COOLDOWN_DECLARE(static/emergency_access_cooldown)
+ /// Whether syndicate mode is enabled or not.
+ var/syndicate = FALSE
+
/// The current state of the UI
var/state = STATE_MAIN
@@ -60,6 +66,33 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
///when was emergency access last toggled
var/last_toggled
+/obj/machinery/computer/communications/syndicate
+ icon_screen = "commsyndie"
+ circuit = /obj/item/circuitboard/computer/communications/syndicate
+ req_access = list(ACCESS_SYNDICATE_LEADER)
+ light_color = LIGHT_COLOR_BLOOD_MAGIC
+
+ syndicate = TRUE
+
+/obj/machinery/computer/communications/syndicate/emag_act(mob/user, obj/item/card/emag/emag_card)
+ return
+
+/obj/machinery/computer/communications/syndicate/can_buy_shuttles(mob/user)
+ return FALSE
+
+/obj/machinery/computer/communications/syndicate/can_send_messages_to_other_sectors(mob/user)
+ return FALSE
+
+/obj/machinery/computer/communications/syndicate/authenticated_as_silicon_or_captain(mob/user)
+ return FALSE
+
+/obj/machinery/computer/communications/syndicate/get_communication_players()
+ var/list/targets = list()
+ for(var/mob/target in GLOB.player_list)
+ if(target.stat == DEAD || target.z == z || target.mind?.has_antag_datum(/datum/antagonist/battlecruiser))
+ targets += target
+ return targets
+
/obj/machinery/computer/communications/Initialize(mapload)
. = ..()
GLOB.shuttle_caller_list += src
@@ -95,8 +128,22 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
else
return ..()
-/obj/machinery/computer/communications/emag_act(mob/user)
- if (obj_flags & EMAGGED)
+/obj/machinery/computer/communications/emag_act(mob/user, obj/item/card/emag/emag_card)
+ if(istype(emag_card, /obj/item/card/emag/battlecruiser))
+ if(!user.mind?.has_antag_datum(/datum/antagonist/traitor))
+ to_chat(user, span_danger("You get the feeling this is a bad idea."))
+ return
+ var/obj/item/card/emag/battlecruiser/caller_card = emag_card
+ if(battlecruiser_called)
+ to_chat(user, span_danger("The card reports a long-range message already sent to the Syndicate fleet...?"))
+ return
+ battlecruiser_called = TRUE
+ caller_card.use_charge(user)
+ addtimer(CALLBACK(GLOBAL_PROC, /proc/summon_battlecruiser), rand(20 SECONDS, 1 MINUTES))
+ playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
+ return
+
+ if(obj_flags & EMAGGED)
return
obj_flags |= EMAGGED
if (authenticated)
@@ -138,7 +185,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
message.answered = answer_index
message.answer_callback.InvokeAsync()
if ("callShuttle")
- if (!authenticated(usr))
+ if (!authenticated(usr) || syndicate)
return
var/reason = trim(params["reason"], MAX_MESSAGE_LEN)
if (length(reason) < CALL_SHUTTLE_REASON_LENGTH)
@@ -188,7 +235,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
return
LAZYREMOVE(messages, LAZYACCESS(messages, message_index))
if ("makePriorityAnnouncement")
- if (!authenticated_as_silicon_or_captain(usr))
+ if (!authenticated_as_silicon_or_captain(usr) && !syndicate)
return
make_announcement(usr)
if ("messageAssociates")
@@ -204,11 +251,14 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
if (emagged)
message_syndicate(message, usr)
to_chat(usr, span_danger("SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND."))
+ else if(syndicate)
+ message_syndicate(message, usr)
+ to_chat(usr, span_danger("Message transmitted to Syndicate Command."))
else
message_centcom(message, usr)
to_chat(usr, span_notice("Message transmitted to Central Command."))
- var/associates = emagged ? "the Syndicate": "CentCom"
+ var/associates = (emagged || syndicate) ? "the Syndicate": "CentCom"
usr.log_talk(message, LOG_SAY, tag = "message to [associates]")
deadchat_broadcast(" has messaged [associates], \"[message]\" at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT)
COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
@@ -247,7 +297,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
state = STATE_MAIN
if ("recallShuttle")
// AIs cannot recall the shuttle
- if (!authenticated(usr) || issilicon(usr))
+ if (!authenticated(usr) || issilicon(usr) || syndicate)
return
SSshuttle.cancelEvac(usr)
if ("requestNukeCodes")
@@ -457,6 +507,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
var/list/data = list(
"authenticated" = FALSE,
"emagged" = FALSE,
+ "syndicate" = syndicate,
)
var/ui_state = issilicon(user) ? cyborg_state : state
@@ -481,7 +532,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
data["canLogOut"] = !issilicon(user)
data["page"] = ui_state
- if (obj_flags & EMAGGED)
+ if ((obj_flags & EMAGGED) || syndicate)
data["emagged"] = TRUE
switch (ui_state)
@@ -502,6 +553,8 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
data["authorizeName"] = authorize_name
data["canLogOut"] = !issilicon(user)
data["shuttleCanEvacOrFailReason"] = SSshuttle.canEvac(user)
+ if(syndicate)
+ data["shuttleCanEvacOrFailReason"] = "You cannot summon the shuttle from this console!"
if (authenticated_as_non_silicon_captain(user))
data["canMessageAssociates"] = TRUE
@@ -527,13 +580,15 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
data["alertLevelTick"] = alert_level_tick
data["canMakeAnnouncement"] = TRUE
data["canSetAlertLevel"] = issilicon(user) ? "NO_SWIPE_NEEDED" : "SWIPE_NEEDED"
+ else if(syndicate)
+ data["canMakeAnnouncement"] = TRUE
if (authenticated_as_ai_or_captain(user))
data["canMessageAssociates"] = TRUE //Skyrat Edit | Allows AI to report to CC in the event of there being no command alive/to begin with
if (SSshuttle.emergency.mode != SHUTTLE_IDLE && SSshuttle.emergency.mode != SHUTTLE_RECALL)
data["shuttleCalled"] = TRUE
- data["shuttleRecallable"] = SSshuttle.canRecall()
+ data["shuttleRecallable"] = SSshuttle.canRecall() || syndicate
if (SSshuttle.emergencyCallAmount)
data["shuttleCalledPreviously"] = TRUE
@@ -619,6 +674,8 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
/obj/machinery/computer/communications/proc/has_communication()
var/turf/current_turf = get_turf(src)
var/z_level = current_turf.z
+ if(syndicate)
+ return TRUE
return is_station_level(z_level) || is_centcom_level(z_level)
/obj/machinery/computer/communications/proc/set_state(mob/user, new_state)
@@ -705,9 +762,13 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE)
to_chat(user, span_warning("You find yourself unable to speak."))
else
input = user.treat_message(input) //Adds slurs and so on. Someone should make this use languages too.
- SScommunications.make_announcement(user, is_ai, input)
+ var/list/players = get_communication_players()
+ SScommunications.make_announcement(user, is_ai, input, syndicate || (obj_flags & EMAGGED), players)
deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(usr, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT)
+/obj/machinery/computer/communications/proc/get_communication_players()
+ return GLOB.player_list
+
/obj/machinery/computer/communications/proc/post_status(command, data1, data2)
var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 52c81052b25..f4273afbd08 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -21,6 +21,7 @@
/obj/machinery/computer/med_data/syndie
icon_keyboard = "syndie_key"
+ req_one_access = list(ACCESS_SYNDICATE)
/obj/machinery/computer/med_data/ui_interact(mob/user)
. = ..()
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 1aa3f584032..fc21f78188b 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -188,6 +188,7 @@
/obj/machinery/computer/secure_data/syndie
icon_keyboard = "syndie_key"
+ req_one_access = list(ACCESS_SYNDICATE)
/obj/machinery/computer/secure_data/laptop
name = "security laptop"
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index b425b1faec9..d90cc50f78e 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -54,8 +54,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
// START LANDMARKS FOLLOW. Don't change the names unless
// you are refactoring shitty landmark code.
/obj/effect/landmark/start/assistant
- name = "Assistant"
- icon_state = "Assistant" //icon_state is case sensitive. why are all of these capitalized? because fuck you that's why
+ name = JOB_ASSISTANT
+ icon_state = JOB_ASSISTANT //icon_state is case sensitive. why are all of these capitalized? because fuck you that's why
/obj/effect/landmark/start/assistant/override
jobspawn_override = TRUE
@@ -173,8 +173,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
icon_state = "Roboticist"
/obj/effect/landmark/start/research_director
- name = "Research Director"
- icon_state = "Research Director"
+ name = JOB_RESEARCH_DIRECTOR
+ icon_state = JOB_RESEARCH_DIRECTOR
/obj/effect/landmark/start/geneticist
name = "Geneticist"
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 4c080dbd5b5..9a9de82e9bf 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -46,6 +46,7 @@
icon_state = "white"
plane = LIGHTING_PLANE
blend_mode = BLEND_ADD
+ luminosity = 1
/obj/effect/abstract/marker
name = "marker"
diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index f6d55bc64dc..14b95f61a0c 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -16,7 +16,7 @@
/obj/item/cardboard_cutout/Initialize(mapload)
. = ..()
possible_appearances = sort_list(list(
- "Assistant" = image(icon = src.icon, icon_state = "cutout_greytide"),
+ JOB_ASSISTANT = image(icon = src.icon, icon_state = "cutout_greytide"),
"Clown" = image(icon = src.icon, icon_state = "cutout_clown"),
"Mime" = image(icon = src.icon, icon_state = "cutout_mime"),
"Traitor" = image(icon = src.icon, icon_state = "cutout_traitor"),
@@ -116,7 +116,7 @@
if(!deceptive)
add_atom_colour("#FFD7A7", FIXED_COLOUR_PRIORITY)
switch(new_appearance)
- if("Assistant")
+ if(JOB_ASSISTANT)
name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
desc = "A cardboat cutout of an assistant."
icon_state = "cutout_greytide"
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index d2a6afa6319..0d8821d6cd2 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -928,6 +928,21 @@
registered_name = "Syndicate"
trim = /datum/id_trim/syndicom/captain
+
+/obj/item/card/id/advanced/black/syndicate_command/captain_id/syndie_spare
+ name = "syndicate captain's spare ID"
+ desc = "The spare ID of the Dark Lord himself."
+ registered_name = "Captain"
+ registered_age = null
+
+/obj/item/card/id/advanced/black/syndicate_command/captain_id/syndie_spare/update_label()
+ if(registered_name == "Captain")
+ name = "[initial(name)][(!assignment || assignment == "Captain") ? "" : " ([assignment])"]"
+ update_appearance(UPDATE_ICON)
+ return
+
+ return ..()
+
/obj/item/card/id/advanced/debug
name = "\improper Debug ID"
desc = "A debug ID card. Has ALL the all access, you really shouldn't have this."
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index ea5e11bd8fd..ca872ce77c3 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -171,6 +171,12 @@
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/computer/communications
+/obj/item/circuitboard/computer/communications/syndicate
+ name = "Syndicate Communications (Computer Board)"
+ greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+ build_path = /obj/machinery/computer/communications/syndicate
+
+
/obj/item/circuitboard/computer/message_monitor
name = "Message Monitor (Computer Board)"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm
index 75ff42e1eb0..7ed4f95ccec 100644
--- a/code/game/objects/items/devices/PDA/virus_cart.dm
+++ b/code/game/objects/items/devices/PDA/virus_cart.dm
@@ -96,6 +96,7 @@
name = "\improper F.R.A.M.E. cartridge"
icon_state = "cart"
var/telecrystals = 0
+ var/current_progression = 0
/obj/item/cartridge/virus/frame/send_virus(obj/item/pda/target, mob/living/U)
if(charges <= 0)
@@ -107,11 +108,28 @@
to_chat(U, span_notice("Virus Sent! The unlock code to the target is: [lock_code]"))
var/datum/component/uplink/hidden_uplink = target.GetComponent(/datum/component/uplink)
if(!hidden_uplink)
- hidden_uplink = target.AddComponent(/datum/component/uplink)
- hidden_uplink.unlock_code = lock_code
+ var/datum/mind/target_mind
+ var/list/backup_players = list()
+ for(var/datum/mind/player as anything in get_crewmember_minds())
+ if(player.assigned_role?.title == target.id?.assignment)
+ backup_players += player
+ if(player.name == target.owner)
+ target_mind = player
+ break
+ if(!target_mind)
+ if(!length(backup_players))
+ target_mind = U.mind
+ else
+ target_mind = pick(backup_players)
+ hidden_uplink = target.AddComponent(/datum/component/uplink, target_mind, enabled = TRUE, starting_tc = telecrystals, has_progression = TRUE)
+ hidden_uplink.uplink_handler.has_objectives = TRUE
+ hidden_uplink.uplink_handler.owner = target_mind
+ hidden_uplink.uplink_handler.can_take_objectives = FALSE
+ hidden_uplink.uplink_handler.progression_points = min(SStraitor.current_global_progression, current_progression)
+ hidden_uplink.uplink_handler.generate_objectives()
+ SStraitor.register_uplink_handler(hidden_uplink.uplink_handler)
else
- hidden_uplink.hidden_crystals += hidden_uplink.telecrystals //Temporarially hide the PDA's crystals, so you can't steal telecrystals.
- hidden_uplink.telecrystals = telecrystals
+ hidden_uplink.add_telecrystals(telecrystals)
telecrystals = 0
hidden_uplink.locked = FALSE
hidden_uplink.active = TRUE
diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm
index eac805df71d..011f2ca655d 100644
--- a/code/game/objects/items/emags.dm
+++ b/code/game/objects/items/emags.dm
@@ -132,3 +132,32 @@
return TRUE
to_chat(user, span_warning("[src] is unable to interface with this. It only seems to fit into airlock electronics."))
return FALSE
+
+/*
+ * Battlecruiser Access
+ */
+/obj/item/card/emag/battlecruiser
+ name = "battlecruiser coordinates upload card"
+ desc = "An ominous card that contains the location of the station, and when applied to a communications console, \
+ the ability to long-distance contact the Syndicate fleet."
+ icon_state = "battlecruisercaller"
+ worn_icon_state = "battlecruisercaller"
+ ///whether we have called the battlecruiser
+ var/used = FALSE
+
+/obj/item/card/emag/battlecruiser/proc/use_charge(mob/user)
+ used = TRUE
+ to_chat(user, span_boldwarning("You use [src], and it interfaces with the communication console. No going back..."))
+
+/obj/item/card/emag/battlecruiser/examine(mob/user)
+ . = ..()
+ . += span_notice("It can only be used on the communications console.")
+
+/obj/item/card/emag/battlecruiser/can_emag(atom/target, mob/user)
+ if(used)
+ to_chat(user, span_warning("[src] is used up."))
+ return FALSE
+ if(!istype(target, /obj/machinery/computer/communications))
+ to_chat(user, span_warning("[src] is unable to interface with this. It only seems to interface with the communication console."))
+ return FALSE
+ return TRUE
diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm
index 0ff9be3f7bc..2275a79429b 100644
--- a/code/game/objects/items/implants/implantuplink.dm
+++ b/code/game/objects/items/implants/implantuplink.dm
@@ -9,11 +9,11 @@
/// The uplink flags of the implant uplink inside, only checked during initialisation so modifying it after initialisation will do nothing
var/uplink_flag = UPLINK_TRAITORS
-/obj/item/implant/uplink/Initialize(mapload, owner, uplink_flag)
+/obj/item/implant/uplink/Initialize(mapload, owner, uplink_handler)
. = ..()
if(!uplink_flag)
uplink_flag = src.uplink_flag
- var/datum/component/uplink/new_uplink = AddComponent(/datum/component/uplink, _owner = owner, _lockable = TRUE, _enabled = FALSE, uplink_flag = uplink_flag, starting_tc = starting_tc)
+ var/datum/component/uplink/new_uplink = AddComponent(/datum/component/uplink, owner = owner, lockable = TRUE, enabled = FALSE, uplink_handler_override = uplink_handler, starting_tc = starting_tc)
new_uplink.unlock_text = "Your Syndicate Uplink has been cunningly implanted in you, for a small TC fee. Simply trigger the uplink to access it."
RegisterSignal(src, COMSIG_COMPONENT_REMOVING, .proc/_component_removal)
@@ -35,9 +35,9 @@
special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit
special_desc = "A Syndicate implanter for an uplink" // Skyrat edit
-/obj/item/implanter/uplink/Initialize(mapload, uplink_flag = UPLINK_TRAITORS)
- imp = new imp_type(src, null, uplink_flag)
- . = ..()
+/obj/item/implanter/uplink/Initialize(mapload, uplink_handler)
+ imp = new imp_type(src, null, uplink_handler)
+ return ..()
/obj/item/implanter/uplink/precharged
name = "implanter" // Skyrat edit , original was implanter (precharged uplink)
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index acb226db943..aebb1ccd99e 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -16,7 +16,7 @@
if(I?.imp_in)
var/datum/component/uplink/hidden_uplink = I.GetComponent(/datum/component/uplink)
if(hidden_uplink)
- hidden_uplink.telecrystals += amount
+ hidden_uplink.add_telecrystals(amount)
use(amount)
to_chat(user, span_notice("You press [src] onto yourself and charge your hidden uplink."))
else
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 9c8c45733d3..dcb07f09a02 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -309,56 +309,6 @@
Good luck agent. You can burn this document with the supplied lighter.
"}
return ..()
-
-/obj/item/storage/box/syndicate/contractor_loadout/PopulateContents()
- new /obj/item/clothing/head/helmet/space/syndicate/contract(src)
- new /obj/item/clothing/suit/space/syndicate/contract(src)
- new /obj/item/clothing/under/chameleon(src)
- new /obj/item/clothing/mask/chameleon(src)
- new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
- new /obj/item/card/id/advanced/chameleon(src)
- new /obj/item/lighter(src)
-
-/obj/item/storage/box/syndicate/contract_kit/PopulateContents()
- new /obj/item/modular_computer/tablet/syndicate_contract_uplink/preset/uplink(src)
- new /obj/item/storage/box/syndicate/contractor_loadout(src)
- new /obj/item/melee/baton/telescopic/contractor_baton(src)
-
- // All about 4 TC or less - some nukeops only items, but fit nicely to the theme.
- var/list/item_list = list(
- /obj/item/storage/backpack/duffelbag/syndie/x4,
- /obj/item/storage/box/syndie_kit/throwing_weapons,
- /obj/item/gun/syringe/syndicate,
- /obj/item/pen/edagger,
- /obj/item/pen/sleepy,
- /obj/item/flashlight/emp,
- /obj/item/reagent_containers/syringe/mulligan,
- /obj/item/clothing/shoes/chameleon/noslip,
- /obj/item/storage/firstaid/tactical,
- /obj/item/encryptionkey/syndicate,
- /obj/item/clothing/glasses/thermal/syndi,
- /obj/item/slimepotion/slime/sentience/nuclear,
- /obj/item/storage/box/syndie_kit/imp_radio,
- /obj/item/storage/box/syndie_kit/imp_uplink,
- /obj/item/clothing/gloves/krav_maga/combatglovesplus,
- /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
- /obj/item/reagent_containers/hypospray/medipen/stimulants,
- /obj/item/storage/box/syndie_kit/imp_freedom,
- /obj/item/toy/eightball/haunted
- )
-
- var/obj/item1 = pick_n_take(item_list)
- var/obj/item2 = pick_n_take(item_list)
- var/obj/item3 = pick_n_take(item_list)
-
- // Create two, non repeat items from the list.
- new item1(src)
- new item2(src)
- new item3(src)
-
- // Paper guide
- new /obj/item/paper/contractor_guide(src)
-
/obj/item/storage/box/syndie_kit
name = "box"
desc = "A sleek, sturdy box."
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index 2acee858f66..71bfbb2a4f1 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -16,7 +16,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32)
/obj/structure/fireaxecabinet/Initialize(mapload)
. = ..()
- fireaxe = new
+ fireaxe = new(src)
update_appearance()
/obj/structure/fireaxecabinet/Destroy()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 4137d2c64e5..331b1949a53 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -206,6 +206,7 @@ GLOBAL_PROTECT(admin_verbs_debug)
/client/proc/adventure_manager,
/client/proc/load_circuit,
/client/proc/cmd_admin_toggle_fov,
+ /client/proc/cmd_admin_debug_traitor_objectives,
)
GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))
GLOBAL_PROTECT(admin_verbs_possess)
diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm
index 0e99742ca82..a70d509c932 100644
--- a/code/modules/admin/antag_panel.dm
+++ b/code/modules/admin/antag_panel.dm
@@ -188,9 +188,15 @@ GLOBAL_VAR(antag_prototypes)
if(U)
uplink_info += "take"
if (check_rights(R_FUN, 0))
- uplink_info += ", [U.telecrystals] TC"
+ uplink_info += ", [U.uplink_handler.telecrystals] TC"
+ if(U.uplink_handler.has_progression)
+ uplink_info += ", [U.uplink_handler.progression_points] PR"
+ if(U.uplink_handler.has_objectives)
+ uplink_info += ", Force Give Objective"
else
- uplink_info += ", [U.telecrystals] TC"
+ uplink_info += ", [U.uplink_handler.telecrystals] TC"
+ if(U.uplink_handler.has_progression)
+ uplink_info += ", [U.uplink_handler.progression_points] PR"
else
uplink_info += "give"
uplink_info += "." //hiel grammar
diff --git a/code/modules/admin/verbs/anonymousnames.dm b/code/modules/admin/verbs/anonymousnames.dm
index 2decae6ac38..c6d8a8fc094 100644
--- a/code/modules/admin/verbs/anonymousnames.dm
+++ b/code/modules/admin/verbs/anonymousnames.dm
@@ -143,7 +143,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
* Spider Clan = "'Leaping Viper' MSO"
* Stations? = "System Port 10"
* Arguments:
- * * is_ai - boolean to decide whether the name has "Core" (AI) or "Assistant" (Cyborg)
+ * * is_ai - boolean to decide whether the name has "Core" (AI) or JOB_ASSISTANT (Cyborg)
*/
/datum/anonymous_theme/proc/anonymous_ai_name(is_ai = FALSE)
return pick(GLOB.ai_names)
@@ -167,7 +167,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
/datum/anonymous_theme/employees/anonymous_ai_name(is_ai = FALSE)
var/verbs = capitalize(pick(GLOB.ing_verbs))
var/phonetic = pick(GLOB.phonetic_alphabet)
- return "Employee [is_ai ? "Core" : "Assistant"] [verbs] [phonetic]"
+ return "Employee [is_ai ? "Core" : JOB_ASSISTANT] [verbs] [phonetic]"
/datum/anonymous_theme/wizards
name = "Wizard Academy"
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 46d26aa36d7..e928b76830d 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(antagonists)
replace_banned_player()
else if(owner.current.client?.holder && (CONFIG_GET(flag/auto_deadmin_antagonists) || owner.current.client.prefs?.toggles & DEADMIN_ANTAGONIST))
owner.current.client.holder.auto_deadmin()
- if(!soft_antag && owner.current.stat != DEAD)
+ if(!soft_antag && owner.current.stat != DEAD && owner.current.client)
owner.current.add_to_current_living_antags()
SEND_SIGNAL(owner, COMSIG_ANTAGONIST_GAINED, src)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 226005868d1..9de064e8306 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -118,7 +118,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
var/tc_per_nukie = round(tc_to_distribute / (length(orphans)+length(uplinks)))
for (var/datum/component/uplink/uplink in uplinks)
- uplink.telecrystals += tc_per_nukie
+ uplink.add_telecrystals(tc_per_nukie)
tc_to_distribute -= tc_per_nukie
for (var/mob/living/L in orphans)
diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm
index b72a433df85..3a351d60a3b 100644
--- a/code/modules/antagonists/nukeop/nukeop.dm
+++ b/code/modules/antagonists/nukeop/nukeop.dm
@@ -20,6 +20,11 @@
/// In the preview icon, a nuclear fission explosive device, only appearing if there's an icon state for it.
var/nuke_icon_state = "nuclearbomb_base"
+ /// The amount of discounts that the team get
+ var/discount_team_amount = 5
+ /// The amount of limited discounts that the team get
+ var/discount_limited_amount = 10
+
/datum/antagonist/nukeop/proc/equip_op()
if(!ishuman(owner.current))
return
@@ -44,9 +49,23 @@
move_to_spawnpoint()
// grant extra TC for the people who start in the nukie base ie. not the lone op
var/extra_tc = CEILING(GLOB.joined_player_list.len/5, 5)
- var/datum/component/uplink/U = owner.find_syndicate_uplink()
- if (U)
- U.telecrystals += extra_tc
+ var/datum/component/uplink/uplink = owner.find_syndicate_uplink()
+ if (uplink)
+ uplink.add_telecrystals(extra_tc)
+
+ var/datum/component/uplink/uplink = owner.find_syndicate_uplink()
+ if(uplink)
+ var/datum/team/nuclear/nuke_team = get_team()
+ if(!nuke_team.team_discounts)
+ var/list/uplink_items = list()
+ for(var/datum/uplink_item/item as anything in SStraitor.uplink_items)
+ if(item.item && !item.cant_discount && (item.purchasable_from & uplink.uplink_handler.uplink_flag) && item.cost > 1)
+ uplink_items += item
+ nuke_team.team_discounts = list()
+ nuke_team.team_discounts += create_uplink_sales(discount_team_amount, /datum/uplink_category/discount_team_gear, -1, uplink_items)
+ nuke_team.team_discounts += create_uplink_sales(discount_limited_amount, /datum/uplink_category/limited_discount_team_gear, 1, uplink_items)
+ uplink.uplink_handler.extra_purchasable += nuke_team.team_discounts
+
memorize_code()
/datum/antagonist/nukeop/get_team()
diff --git a/code/modules/antagonists/traitor/balance_helper.dm b/code/modules/antagonists/traitor/balance_helper.dm
new file mode 100644
index 00000000000..e78625ff1c1
--- /dev/null
+++ b/code/modules/antagonists/traitor/balance_helper.dm
@@ -0,0 +1,115 @@
+/client/proc/cmd_admin_debug_traitor_objectives()
+ set name = "Debug Traitor Objectives"
+ set category = "Debug"
+
+ if(!check_rights(R_DEBUG))
+ return
+
+ SStraitor.traitor_debug_panel?.ui_interact(usr)
+
+/datum/traitor_objective_debug
+ var/list/all_objectives
+
+/datum/traitor_objective_debug/New(datum/traitor_category_handler/category_handler)
+ . = ..()
+ all_objectives = list()
+ for(var/datum/traitor_objective_category/category as anything in category_handler.all_categories)
+ var/list/generated_list = list()
+ var/list/current_list = category.objectives
+ for(var/value in category.objectives)
+ if(islist(value))
+ generated_list += list(list(
+ "objectives" = recursive_list_generate(value),
+ "weight" = current_list[value]
+ ))
+ else
+ generated_list += list(generate_objective_data(value, current_list[value]))
+ all_objectives += list(list(
+ "name" = category.name,
+ "objectives" = generated_list,
+ "weight" = category.weight,
+ ))
+
+/datum/traitor_objective_debug/proc/recursive_list_generate(list/to_check)
+ var/list/generated_list = list()
+ for(var/value in to_check)
+ if(islist(value))
+ generated_list += list(list(
+ "objectives" = recursive_list_generate(value),
+ "weight" = to_check[value]
+ ))
+ else
+ generated_list += list(generate_objective_data(value, to_check[value]))
+ return generated_list
+
+/datum/traitor_objective_debug/proc/generate_objective_data(datum/traitor_objective/objective_type, weight)
+ // Need to set this to false before we create the new objective to prevent init from fucking it up
+ SStraitor.generate_objectives = FALSE
+ var/datum/traitor_objective/objective = new objective_type()
+ var/list/return_data = list(
+ "name" = objective.name,
+ "description" = objective.description,
+ "progression_minimum" = objective.progression_minimum,
+ "progression_maximum" = objective.progression_maximum,
+ "global_progression" = objective.global_progression_deviance_required,
+ "global_progression_limit_coeff" = objective.global_progression_limit_coeff,
+ "global_progression_influence_intensity" = objective.global_progression_influence_intensity,
+ "progression_reward" = objective.progression_reward,
+ "telecrystal_reward" = objective.telecrystal_reward,
+ "telecrystal_penalty" = objective.telecrystal_penalty,
+ "weight" = weight,
+ "type" = objective.type,
+ )
+ qdel(objective)
+ SStraitor.generate_objectives = TRUE
+ return return_data
+
+/datum/traitor_objective_debug/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "TraitorObjectiveDebug")
+ ui.open()
+
+/datum/traitor_objective_debug/ui_data(mob/user)
+ var/list/data = list()
+ data["current_progression"] = SStraitor.current_global_progression
+ var/list/handlers = SStraitor.uplink_handlers
+ var/list/handler_data = list()
+ for(var/datum/uplink_handler/handler as anything in handlers)
+ var/total_progression_from_objectives = 0
+ for(var/datum/traitor_objective/objective as anything in handler.completed_objectives)
+ if(objective.objective_state != OBJECTIVE_STATE_COMPLETED)
+ continue
+ total_progression_from_objectives += objective.progression_reward
+ handler_data += list(list(
+ "player" = handler.owner?.key,
+ "progression_points" = handler.progression_points,
+ "total_progression_from_objectives" = total_progression_from_objectives
+ ))
+ data["player_data"] = handler_data
+ return data
+
+/datum/traitor_objective_debug/ui_static_data(mob/user)
+ var/list/data = list()
+ data["objective_data"] = all_objectives
+ data["progression_scaling_deviance"] = SStraitor.progression_scaling_deviance
+ return data
+
+/datum/traitor_objective_debug/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/traitor_objective_debug/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("set_current_expected_progression")
+ SStraitor.current_global_progression = text2num(params["new_expected_progression"])
+ return TRUE
+ if("generate_json")
+ var/temp_file = file("data/TraitorObjectiveDownloadTempFile")
+ fdel(temp_file)
+ WRITE_FILE(temp_file, all_objectives)
+ DIRECT_OUTPUT(ui.user, ftp(temp_file, "TraitorObjectiveData.json"))
+ return TRUE
diff --git a/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm b/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm
new file mode 100644
index 00000000000..b5d631ef874
--- /dev/null
+++ b/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm
@@ -0,0 +1,54 @@
+/// Helper component that registers signals on an object
+/// This is not necessary to use and gives little control over the conditions
+/datum/component/traitor_objective_register
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+
+ /// The target to apply the succeed/fail signals onto
+ var/datum/target
+ /// Signals to listen out for to automatically succeed the objective
+ var/succeed_signals
+ /// Signals to listen out for to automatically fail the objective.
+ var/fail_signals
+ /// Whether failing has a penalty
+ var/penalty = 0
+
+/datum/component/traitor_objective_register/Initialize(datum/target, succeed_signals, fail_signals, penalty)
+ . = ..()
+ if(!istype(parent, /datum/traitor_objective))
+ return COMPONENT_INCOMPATIBLE
+ src.target = target
+ src.succeed_signals = succeed_signals
+ src.fail_signals = fail_signals
+ src.penalty = penalty
+
+/datum/component/traitor_objective_register/RegisterWithParent()
+ if(succeed_signals)
+ RegisterSignal(target, succeed_signals, .proc/on_success)
+ if(fail_signals)
+ RegisterSignal(target, fail_signals, .proc/on_fail)
+ RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), .proc/delete_self)
+
+/datum/component/traitor_objective_register/UnregisterFromParent()
+ if(target)
+ if(succeed_signals)
+ UnregisterSignal(target, succeed_signals)
+ if(fail_signals)
+ UnregisterSignal(target, fail_signals)
+ UnregisterSignal(parent, list(
+ COMSIG_TRAITOR_OBJECTIVE_COMPLETED,
+ COMSIG_TRAITOR_OBJECTIVE_FAILED
+ ))
+
+/datum/component/traitor_objective_register/proc/on_fail(datum/traitor_objective/source)
+ SIGNAL_HANDLER
+ var/datum/traitor_objective/objective = parent
+ objective.succeed_objective()
+
+/datum/component/traitor_objective_register/proc/on_success()
+ SIGNAL_HANDLER
+ var/datum/traitor_objective/objective = parent
+ objective.succeed_objective()
+
+/datum/component/traitor_objective_register/proc/delete_self()
+ SIGNAL_HANDLER
+ qdel(src)
diff --git a/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm b/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm
new file mode 100644
index 00000000000..e0abde5fe3c
--- /dev/null
+++ b/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm
@@ -0,0 +1,41 @@
+/// Helper component to track events on
+/datum/component/traitor_objective_limit_per_time
+ dupe_mode = COMPONENT_DUPE_HIGHLANDER
+
+ /// The maximum time that an objective will be considered for. Set to -1 to accept any time.
+ var/time_period = 0
+ /// The maximum amount of objectives that can be active or recently active at one time
+ var/maximum_objectives = 0
+ /// The typepath which we check for
+ var/typepath
+
+/datum/component/traitor_objective_limit_per_time/Initialize(typepath, time_period, maximum_objectives)
+ . = ..()
+ if(!istype(parent, /datum/traitor_objective))
+ return COMPONENT_INCOMPATIBLE
+ src.time_period = time_period
+ src.maximum_objectives = maximum_objectives
+ src.typepath = typepath
+ if(!typepath)
+ src.typepath = parent.type
+
+/datum/component/traitor_objective_limit_per_time/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE, .proc/handle_generate)
+
+/datum/component/traitor_objective_limit_per_time/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE)
+
+
+/datum/component/traitor_objective_limit_per_time/proc/handle_generate(datum/traitor_objective/source, datum/mind/owner, list/potential_duplicates)
+ SIGNAL_HANDLER
+ var/datum/uplink_handler/handler = source.handler
+ if(!handler)
+ return
+ var/count = 0
+ for(var/datum/traitor_objective/objective as anything in handler.potential_duplicate_objectives[typepath])
+ if(time_period != -1 && objective.objective_state != OBJECTIVE_STATE_INACTIVE && (world.time - objective.time_of_completion) > time_period)
+ continue
+ count++
+
+ if(count >= maximum_objectives)
+ return COMPONENT_TRAITOR_OBJECTIVE_ABORT_GENERATION
diff --git a/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm
new file mode 100644
index 00000000000..eb7933c2a9c
--- /dev/null
+++ b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm
@@ -0,0 +1,40 @@
+/// Helper component to track events on
+/datum/component/traitor_objective_mind_tracker
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+
+ /// The target to track
+ var/datum/mind/target
+ /// Signals to listen out for mapped to procs to call
+ var/list/signals
+ /// Current registered target
+ var/mob/current_registered_target
+
+/datum/component/traitor_objective_mind_tracker/Initialize(datum/target, signals)
+ . = ..()
+ if(!istype(parent, /datum/traitor_objective))
+ return COMPONENT_INCOMPATIBLE
+ src.target = target
+ src.signals = signals
+
+/datum/component/traitor_objective_mind_tracker/RegisterWithParent()
+ RegisterSignal(target, COMSIG_MIND_TRANSFERRED, .proc/handle_mind_transferred)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/delete_self)
+ RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), .proc/delete_self)
+ handle_mind_transferred(target)
+
+/datum/component/traitor_objective_mind_tracker/UnregisterFromParent()
+ UnregisterSignal(target, COMSIG_MIND_TRANSFERRED)
+ if(target.current)
+ parent.UnregisterSignal(target.current, signals)
+
+/datum/component/traitor_objective_mind_tracker/proc/handle_mind_transferred(datum/source, mob/previous_body)
+ SIGNAL_HANDLER
+ if(current_registered_target)
+ parent.UnregisterSignal(current_registered_target, signals)
+
+ for(var/signal in signals)
+ parent.RegisterSignal(target.current, signal, signals[signal])
+
+/datum/component/traitor_objective_mind_tracker/proc/delete_self()
+ SIGNAL_HANDLER
+ qdel(src)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index a45cad765f3..0379f389b0b 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -1,18 +1,3 @@
-/// Chance that the traitor could roll hijack if the pop limit is met.
-#define HIJACK_PROB 10
-/// Hijack is unavailable as a random objective below this player count.
-#define HIJACK_MIN_PLAYERS 30
-
-/// Chance the traitor gets a martyr objective instead of having to escape alive, as long as all the objectives are martyr compatible.
-#define MARTYR_PROB 20
-
-/// Chance the traitor gets a kill objective. If this prob fails, they will get a steal objective instead.
-#define KILL_PROB 50
-/// If a kill objective is rolled, chance that it is to destroy the AI.
-#define DESTROY_AI_PROB(denominator) (100 / denominator)
-/// If the destroy AI objective doesn't roll, chance that we'll get a maroon instead. If this prob fails, they will get a generic assassinate objective instead.
-#define MAROON_PROB 30
-
/datum/antagonist/traitor
name = "\improper Traitor"
roundend_category = "traitors"
@@ -40,10 +25,10 @@
///reference to the uplink this traitor was given, if they were.
var/datum/component/uplink/uplink
- var/datum/contractor_hub/contractor_hub
+ /// The uplink handler that this traitor belongs to.
+ var/datum/uplink_handler/uplink_handler
- ///the final objective the traitor has to accomplish, be it escaping, hijacking, or just martyrdom.
- var/datum/objective/ending_objective
+ var/uplink_sale_count = 3
/datum/antagonist/traitor/New(give_objectives = TRUE)
. = ..()
@@ -56,10 +41,32 @@
owner.give_uplink(silent = TRUE, antag_datum = src)
uplink = owner.find_syndicate_uplink()
+ if(uplink)
+ if(uplink_handler)
+ uplink.uplink_handler = uplink_handler
+ else
+ uplink_handler = uplink.uplink_handler
+ uplink_handler.has_progression = TRUE
+ SStraitor.register_uplink_handler(uplink_handler)
+
+ uplink_handler.has_objectives = TRUE
+ uplink_handler.owner = owner
+ uplink_handler.assigned_role = owner.assigned_role.title
+ uplink_handler.generate_objectives()
+
+ if(uplink_handler.progression_points < SStraitor.current_global_progression)
+ uplink_handler.progression_points = SStraitor.current_global_progression * SStraitor.newjoin_progression_coeff
+ var/list/uplink_items = list()
+ for(var/datum/uplink_item/item as anything in SStraitor.uplink_items)
+ if(item.item && (!length(item.restricted_roles) || (uplink_handler.assigned_role in item.restricted_roles)) \
+ && !item.cant_discount && (item.purchasable_from & uplink_handler.uplink_flag) && item.cost > 1)
+ uplink_items += item
+ uplink_handler.extra_purchasable += create_uplink_sales(uplink_sale_count, /datum/uplink_category/discounts, -1, uplink_items)
+
+ RegisterSignal(uplink, COMSIG_PARENT_QDELETING, .proc/on_uplink_lost)
if(give_objectives)
forge_traitor_objectives()
- forge_ending_objective()
var/faction = prob(75) ? FACTION_SYNDICATE : FACTION_NANOTRASEN
@@ -71,6 +78,10 @@
return ..()
+/datum/antagonist/traitor/proc/on_uplink_lost(datum/source)
+ SIGNAL_HANDLER
+ uplink = null
+
/datum/antagonist/traitor/on_removal()
owner.special_role = null
return ..()
@@ -79,11 +90,6 @@
var/list/possible_employers = list()
possible_employers.Add(GLOB.syndicate_employers, GLOB.nanotrasen_employers)
- if(istype(ending_objective, /datum/objective/hijack))
- possible_employers -= GLOB.normal_employers
- else //escape or martyrdom
- possible_employers -= GLOB.hijack_employers
-
switch(faction)
if(FACTION_SYNDICATE)
possible_employers -= GLOB.nanotrasen_employers
@@ -91,96 +97,71 @@
possible_employers -= GLOB.syndicate_employers
employer = pick(possible_employers)
+/datum/objective/traitor_progression
+ name = "traitor progression"
+ explanation_text = "Become a living legend by getting a total of %REPUTATION% reputation points"
+
+ var/possible_range = list(40 MINUTES, 90 MINUTES)
+ var/required_total_progression_points
+
+/datum/objective/traitor_progression/New(text)
+ . = ..()
+ required_total_progression_points = round(rand(possible_range[1], possible_range[2]) / 60)
+ explanation_text = replacetext(explanation_text, "%REPUTATION%", required_total_progression_points)
+
+/datum/objective/traitor_progression/check_completion()
+ if(!owner)
+ return FALSE
+ var/datum/antagonist/traitor/traitor = owner.has_antag_datum(/datum/antagonist/traitor)
+ if(!traitor)
+ return FALSE
+ if(!traitor.uplink_handler)
+ return FALSE
+ if(traitor.uplink_handler.progression_points < required_total_progression_points)
+ return FALSE
+ return TRUE
+
+/datum/objective/traitor_objectives
+ name = "traitor objective"
+ explanation_text = "Complete objectives colletively worth more than %REPUTATION% reputation points"
+
+ var/possible_range = list(20 MINUTES, 30 MINUTES)
+ var/required_progression_in_objectives
+
+/datum/objective/traitor_objectives/New(text)
+ . = ..()
+ required_progression_in_objectives = round(rand(possible_range[1], possible_range[2]) / 60)
+ explanation_text = replacetext(explanation_text, "%REPUTATION%", required_progression_in_objectives)
+
+/datum/objective/traitor_objectives/check_completion()
+ if(!owner)
+ return FALSE
+ var/datum/antagonist/traitor/traitor = owner.has_antag_datum(/datum/antagonist/traitor)
+ if(!traitor)
+ return FALSE
+ if(!traitor.uplink_handler)
+ return FALSE
+ var/total_points = 0
+ for(var/datum/traitor_objective/objective as anything in traitor.uplink_handler.completed_objectives)
+ if(objective.objective_state != OBJECTIVE_STATE_COMPLETED)
+ continue
+ total_points += objective.progression_reward
+ if(total_points < required_progression_in_objectives)
+ return FALSE
+ return TRUE
+
/// Generates a complete set of traitor objectives up to the traitor objective limit, including non-generic objectives such as martyr and hijack.
/datum/antagonist/traitor/proc/forge_traitor_objectives()
objectives.Cut()
- var/objective_count = 0
- if((GLOB.joined_player_list.len >= HIJACK_MIN_PLAYERS) && prob(HIJACK_PROB))
- is_hijacker = TRUE
- objective_count++
+ var/datum/objective/traitor_progression/final_objective = new /datum/objective/traitor_progression()
+ final_objective.owner = owner
+ objectives += final_objective
- var/objective_limit = CONFIG_GET(number/traitor_objectives_amount)
+ var/datum/objective/traitor_objectives/objective_completion = new /datum/objective/traitor_objectives()
+ objective_completion.owner = owner
+ objectives += objective_completion
- // for(in...to) loops iterate inclusively, so to reach objective_limit we need to loop to objective_limit - 1
- // This does not give them 1 fewer objectives than intended.
- for(var/i in objective_count to objective_limit - 1)
- objectives += forge_single_generic_objective()
-
-
-/**
- * ## forge_ending_objective
- *
- * Forges the endgame objective and adds it to this datum's objective list.
- */
-/datum/antagonist/traitor/proc/forge_ending_objective()
- if(is_hijacker)
- ending_objective = new /datum/objective/hijack
- ending_objective.owner = owner
- return
-
- var/martyr_compatibility = TRUE
-
- for(var/datum/objective/traitor_objective in objectives)
- if(!traitor_objective.martyr_compatible)
- martyr_compatibility = FALSE
- break
-
- if(martyr_compatibility && prob(MARTYR_PROB))
- ending_objective = new /datum/objective/martyr
- ending_objective.owner = owner
- objectives += ending_objective
- return
-
- ending_objective = new /datum/objective/escape
- ending_objective.owner = owner
- objectives += ending_objective
-
-/// Forges a single escape objective and adds it to this datum's objective list.
-/datum/antagonist/traitor/proc/forge_escape_objective()
- var/is_martyr = prob(MARTYR_PROB)
- var/martyr_compatibility = TRUE
-
- for(var/datum/objective/traitor_objective in objectives)
- if(!traitor_objective.martyr_compatible)
- martyr_compatibility = FALSE
- break
-
- if(martyr_compatibility && is_martyr)
- var/datum/objective/martyr/martyr_objective = new
- martyr_objective.owner = owner
- objectives += martyr_objective
- return
-
- var/datum/objective/escape/escape_objective = new
- escape_objective.owner = owner
- objectives += escape_objective
-
-/// Adds a generic kill or steal objective to this datum's objective list.
-/datum/antagonist/traitor/proc/forge_single_generic_objective()
- if(prob(KILL_PROB))
- var/list/active_ais = active_ais()
- if(active_ais.len && prob(DESTROY_AI_PROB(GLOB.joined_player_list.len)))
- var/datum/objective/destroy/destroy_objective = new
- destroy_objective.owner = owner
- destroy_objective.find_target()
- return destroy_objective
-
- if(prob(MAROON_PROB))
- var/datum/objective/maroon/maroon_objective = new
- maroon_objective.owner = owner
- maroon_objective.find_target()
- return maroon_objective
-
- var/datum/objective/assassinate/kill_objective = new
- kill_objective.owner = owner
- kill_objective.find_target()
- return kill_objective
-
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = owner
- steal_objective.find_target()
- return steal_objective
/datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override)
. = ..()
@@ -259,10 +240,14 @@
result += objectives_text
- var/special_role_text = lowertext(name)
+ if(uplink_handler)
+ var/completed_objectives_text = "Completed Uplink Objectives: "
+ for(var/datum/traitor_objective/objective as anything in uplink_handler.completed_objectives)
+ if(objective.objective_state == OBJECTIVE_STATE_COMPLETED)
+ completed_objectives_text += " [objective.name] - ([objective.telecrystal_reward] TC, [round(objective.progression_reward/600, 0.1)] Reputation)"
+ result += completed_objectives_text
- if (contractor_hub)
- result += contractor_round_end()
+ var/special_role_text = lowertext(name)
if(traitor_won)
result += span_greentext("The [special_role_text] was successful!")
@@ -272,42 +257,6 @@
return result.Join(" ")
-/// Proc detailing contract kit buys/completed contracts/additional info
-/datum/antagonist/traitor/proc/contractor_round_end()
- var/result = ""
- var/total_spent_rep = 0
-
- var/completed_contracts = contractor_hub.contracts_completed
- var/tc_total = contractor_hub.contract_TC_payed_out + contractor_hub.contract_TC_to_redeem
-
- var/contractor_item_icons = "" // Icons of purchases
- var/contractor_support_unit = "" // Set if they had a support unit - and shows appended to their contracts completed
-
- /// Get all the icons/total cost for all our items bought
- for (var/datum/contractor_item/contractor_purchase in contractor_hub.purchased_items)
- contractor_item_icons += "\[ [contractor_purchase.name] - [contractor_purchase.cost] Rep
[contractor_purchase.desc] \]"
-
- total_spent_rep += contractor_purchase.cost
-
- /// Special case for reinforcements, we want to show their ckey and name on round end.
- if (istype(contractor_purchase, /datum/contractor_item/contractor_partner))
- var/datum/contractor_item/contractor_partner/partner = contractor_purchase
- contractor_support_unit += " [partner.partner_mind.key] played [partner.partner_mind.current.name], their contractor support unit."
-
- if (contractor_hub.purchased_items.len)
- result += " (used [total_spent_rep] Rep) "
- result += contractor_item_icons
- result += " "
- if (completed_contracts > 0)
- var/pluralCheck = "contract"
- if (completed_contracts > 1)
- pluralCheck = "contracts"
-
- result += "Completed [span_greentext("[completed_contracts]")] [pluralCheck] for a total of \
- [span_greentext("[tc_total] TC")]![contractor_support_unit] "
-
- return result
-
/datum/antagonist/traitor/roundend_report_footer()
var/phrases = jointext(GLOB.syndicate_code_phrase, ", ")
var/responses = jointext(GLOB.syndicate_code_response, ", ")
@@ -333,10 +282,3 @@
sword.worn_icon_state = "e_sword_on_red"
H.update_inv_hands()
-
-#undef HIJACK_PROB
-#undef HIJACK_MIN_PLAYERS
-#undef MARTYR_PROB
-#undef KILL_PROB
-#undef DESTROY_AI_PROB
-#undef MAROON_PROB
diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm
deleted file mode 100644
index 6d82179dcfa..00000000000
--- a/code/modules/antagonists/traitor/equipment/contractor.dm
+++ /dev/null
@@ -1,292 +0,0 @@
-/// Support unit gets it's own very basic antag datum for admin logging.
-/datum/antagonist/traitor/contractor_support
- name = "Contractor Support Unit"
- antag_moodlet = /datum/mood_event/focused
-
- show_in_roundend = FALSE /// We're already adding them in to the contractor's roundend.
- give_objectives = TRUE /// We give them their own custom objective.
- show_in_antagpanel = FALSE /// Not a proper/full antag.
- give_uplink = FALSE /// Don't give them an uplink.
-
- var/datum/team/contractor_team/contractor_team
-
-/// Team for storing both the contractor and their support unit - only really for the HUD and admin logging.
-/datum/team/contractor_team
- show_roundend_report = FALSE
-
-/datum/antagonist/traitor/contractor_support/forge_traitor_objectives()
- var/datum/objective/generic_objective = new
-
- generic_objective.name = "Follow Contractor's Orders"
- generic_objective.explanation_text = "Follow your orders. Assist agents in this mission area."
-
- generic_objective.completed = TRUE
-
- objectives += generic_objective
-
-/datum/contractor_hub
- var/contract_rep = 0
- var/list/hub_items = list()
- var/list/purchased_items = list()
- var/static/list/contractor_items = typecacheof(/datum/contractor_item/, TRUE)
-
- var/datum/syndicate_contract/current_contract
- var/list/datum/syndicate_contract/assigned_contracts = list()
-
- var/list/assigned_targets = list() // used as a blacklist to make sure we're not assigning targets already assigned
-
- var/contracts_completed = 0
- var/contract_TC_payed_out = 0 // Keeping track for roundend reporting
- var/contract_TC_to_redeem = 0 // Used internally and roundend reporting - what TC we have available to cashout.
-
-/datum/contractor_hub/proc/create_hub_items()
- for(var/path in contractor_items)
- var/datum/contractor_item/contractor_item = new path
-
- hub_items.Add(contractor_item)
-
-/datum/contractor_hub/proc/create_contracts(datum/mind/owner)
-
- // 6 initial contracts
- var/list/to_generate = list(
- CONTRACT_PAYOUT_LARGE,
- CONTRACT_PAYOUT_MEDIUM,
- CONTRACT_PAYOUT_SMALL,
- CONTRACT_PAYOUT_SMALL,
- CONTRACT_PAYOUT_SMALL,
- CONTRACT_PAYOUT_SMALL
- )
-
- //What the fuck
- if(length(to_generate) > length(GLOB.data_core.locked))
- to_generate.Cut(1, length(GLOB.data_core.locked))
-
- // We don't want the sum of all the payouts to be under this amount
- var/lowest_TC_threshold = 30
-
- var/total = 0
- var/lowest_paying_sum = 0
- var/datum/syndicate_contract/lowest_paying_contract
-
- // Randomise order, so we don't have contracts always in payout order.
- to_generate = shuffle(to_generate)
-
- // Support contract generation happening multiple times
- var/start_index = 1
- if (assigned_contracts.len != 0)
- start_index = assigned_contracts.len + 1
-
- // Generate contracts, and find the lowest paying.
- for(var/i in 1 to to_generate.len)
- var/datum/syndicate_contract/contract_to_add = new(owner, assigned_targets, to_generate[i])
- var/contract_payout_total = contract_to_add.contract.payout + contract_to_add.contract.payout_bonus
-
- assigned_targets.Add(contract_to_add.contract.target)
-
- if (!lowest_paying_contract || (contract_payout_total < lowest_paying_sum))
- lowest_paying_sum = contract_payout_total
- lowest_paying_contract = contract_to_add
-
- total += contract_payout_total
- contract_to_add.id = start_index
- assigned_contracts.Add(contract_to_add)
-
- start_index++
-
- // If the threshold for TC payouts isn't reached, boost the lowest paying contract
- if (total < lowest_TC_threshold)
- lowest_paying_contract.contract.payout_bonus += (lowest_TC_threshold - total)
-
-/datum/contractor_item
- var/name // Name of item
- var/desc // description of item
- var/item // item path, no item path means the purchase needs it's own handle_purchase()
- var/item_icon = "broadcast-tower" // fontawesome icon to use inside the hub - https://fontawesome.com/icons/
- var/limited = -1 // Any number above 0 for how many times it can be bought in a round for a single traitor. -1 is unlimited.
- var/cost // Cost of the item in contract rep.
-
-/datum/contractor_item/contract_reroll
- name = "Contract Reroll"
- desc = "Request a reroll of your current contract list. Will generate a new target, payment, and dropoff for the contracts you currently have available."
- item_icon = "dice"
- limited = 2
- cost = 0
-
-/datum/contractor_item/contract_reroll/handle_purchase(datum/contractor_hub/hub)
- . = ..()
-
- if (.)
- /// We're not regenerating already completed/aborted/extracting contracts, but we don't want to repeat their targets.
- var/list/new_target_list = list()
- for(var/datum/syndicate_contract/contract_check in hub.assigned_contracts)
- if (contract_check.status != CONTRACT_STATUS_ACTIVE && contract_check.status != CONTRACT_STATUS_INACTIVE)
- if (contract_check.contract.target)
- new_target_list.Add(contract_check.contract.target)
- continue
-
- /// Reroll contracts without duplicates
- for(var/datum/syndicate_contract/rerolling_contract in hub.assigned_contracts)
- if (rerolling_contract.status != CONTRACT_STATUS_ACTIVE && rerolling_contract.status != CONTRACT_STATUS_INACTIVE)
- continue
-
- rerolling_contract.generate(new_target_list)
- new_target_list.Add(rerolling_contract.contract.target)
-
- /// Set our target list with the new set we've generated.
- hub.assigned_targets = new_target_list
-
-/datum/contractor_item/contractor_pinpointer
- name = "Contractor Pinpointer"
- desc = "A pinpointer that finds targets even without active suit sensors. Due to taking advantage of an exploit within the system, it can't pinpoint to the same accuracy as the traditional models. Becomes permanently locked to the user that first activates it."
- item = /obj/item/pinpointer/crew/contractor
- item_icon = "search-location"
- limited = 2
- cost = 1
-
-/datum/contractor_item/fulton_extraction_kit
- name = "Fulton Extraction Kit"
- desc = "For getting your target across the station to those difficult dropoffs. Place the beacon somewhere secure, and link the pack. Activating the pack on your target in space will send them over to the beacon - make sure they're not just going to run away though!"
- item = /obj/item/storage/box/contractor/fulton_extraction
- item_icon = "parachute-box"
- limited = 1
- cost = 1
-
-/datum/contractor_item/contractor_partner
- name = "Reinforcements"
- desc = "Upon purchase we'll contact available units in the area. Should there be an agent free, we'll send them down to assist you immediately. If no units are free, we give a full refund."
- item_icon = "user-friends"
- limited = 1
- cost = 2
- var/datum/mind/partner_mind = null
-
-/datum/contractor_item/contractor_partner/handle_purchase(datum/contractor_hub/hub, mob/living/user)
- . = ..()
-
- if (.)
- to_chat(user, span_notice("The uplink vibrates quietly, connecting to nearby agents..."))
-
- var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as the Contractor Support Unit for [user.real_name]?", ROLE_PAI, FALSE, 100, POLL_IGNORE_CONTRACTOR_SUPPORT)
-
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- spawn_contractor_partner(user, C.key)
- else
- to_chat(user, span_notice("No available agents at this time, please try again later."))
-
- // refund and add the limit back.
- limited += 1
- hub.contract_rep += cost
- hub.purchased_items -= src
-
-/datum/outfit/contractor_partner
- name = "Contractor Support Unit"
-
- uniform = /obj/item/clothing/under/chameleon
- suit = /obj/item/clothing/suit/chameleon
- back = /obj/item/storage/backpack
- belt = /obj/item/pda/chameleon
- mask = /obj/item/clothing/mask/cigarette/syndicate
- shoes = /obj/item/clothing/shoes/chameleon/noslip
- ears = /obj/item/radio/headset/chameleon
- id = /obj/item/card/id/advanced/chameleon
- r_hand = /obj/item/storage/toolbox/syndicate
- id_trim = /datum/id_trim/chameleon/operative
-
- backpack_contents = list(/obj/item/storage/box/survival, /obj/item/implanter/uplink, /obj/item/clothing/mask/chameleon,
- /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/lighter)
-
-/datum/outfit/contractor_partner/post_equip(mob/living/carbon/human/H, visualsOnly)
- . = ..()
- var/obj/item/clothing/mask/cigarette/syndicate/cig = H.get_item_by_slot(ITEM_SLOT_MASK)
-
- // pre-light their cig
- cig.light()
-
-/datum/contractor_item/contractor_partner/proc/spawn_contractor_partner(mob/living/user, key)
- var/mob/living/carbon/human/partner = new()
- var/datum/outfit/contractor_partner/partner_outfit = new()
-
- partner_outfit.equip(partner)
-
- var/obj/structure/closet/supplypod/arrival_pod = new(null, STYLE_SYNDICATE)
- arrival_pod.explosionSize = list(0,0,0,1)
- arrival_pod.bluespace = TRUE
-
- var/turf/free_location = find_obstruction_free_location(2, user)
-
- // We really want to send them - if we can't find a nice location just land it on top of them.
- if (!free_location)
- free_location = get_turf(user)
-
- partner.forceMove(arrival_pod)
- partner.ckey = key
-
- /// We give a reference to the mind that'll be the support unit
- partner_mind = partner.mind
- partner_mind.make_contractor_support()
-
- to_chat(partner_mind.current, "\n[span_alertwarning("[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.")]")
- to_chat(partner_mind.current, "[span_alertwarning("Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.")]\n\n")
-
- new /obj/effect/pod_landingzone(free_location, arrival_pod)
-
-/datum/contractor_item/blackout
- name = "Blackout"
- desc = "Request Syndicate Command to distrupt the station's powernet. Disables power across the station for a short duration."
- item_icon = "bolt"
- limited = 2
- cost = 3
-
-/datum/contractor_item/blackout/handle_purchase(datum/contractor_hub/hub)
- . = ..()
-
- if (.)
- power_fail(35, 50)
- priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF)
-
-// Subtract cost, and spawn if it's an item.
-/datum/contractor_item/proc/handle_purchase(datum/contractor_hub/hub, mob/living/user)
-
- if (hub.contract_rep >= cost)
- hub.contract_rep -= cost
- else
- return FALSE
-
- if (limited >= 1)
- limited -= 1
- else if (limited == 0)
- return FALSE
-
- hub.purchased_items.Add(src)
-
- user.playsound_local(user, 'sound/machines/uplinkpurchase.ogg', 100)
-
- if (item && ispath(item))
- var/atom/item_to_create = new item(get_turf(user))
-
- if(user.put_in_hands(item_to_create))
- to_chat(user, span_notice("Your purchase materializes into your hands!"))
- else
- to_chat(user, span_notice("Your purchase materializes onto the floor."))
-
- return item_to_create
- return TRUE
-
-/obj/item/pinpointer/crew/contractor
- name = "contractor pinpointer"
- desc = "A handheld tracking device that locks onto certain signals. Ignores suit sensors, but is much less accurate."
- icon_state = "pinpointer_syndicate"
- worn_icon_state = "pinpointer_black"
- minimum_range = 25
- has_owner = TRUE
- ignore_suit_sensor_level = TRUE
-
-/obj/item/storage/box/contractor/fulton_extraction
- name = "Fulton Extraction Kit"
- icon_state = "syndiebox"
- illustration = "writing_syndie"
-
-/obj/item/storage/box/contractor/fulton_extraction/PopulateContents()
- new /obj/item/extraction_pack(src)
- new /obj/item/fulton_core(src)
-
diff --git a/code/modules/antagonists/traitor/objective_category.dm b/code/modules/antagonists/traitor/objective_category.dm
new file mode 100644
index 00000000000..e64086ad922
--- /dev/null
+++ b/code/modules/antagonists/traitor/objective_category.dm
@@ -0,0 +1,68 @@
+/// The traitor category handler. This is where the probability of all objectives are managed.
+/datum/traitor_category_handler
+ var/list/datum/traitor_objective_category/all_categories = list()
+
+/datum/traitor_category_handler/New()
+ . = ..()
+ for(var/type in subtypesof(/datum/traitor_objective_category))
+ var/datum/traitor_objective_category/category = new type()
+ if(length(category.objectives))
+ all_categories += category
+ else
+ // Category should just get autoGC'd here if they don't have any length, this may not be necessary
+ qdel(category)
+
+/datum/traitor_category_handler/proc/objective_valid(datum/traitor_objective/objective_path, progression_points)
+ if(initial(objective_path.abstract_type) == objective_path)
+ return FALSE
+ if(progression_points < initial(objective_path.progression_minimum))
+ return FALSE
+ if(progression_points > initial(objective_path.progression_maximum))
+ return FALSE
+ return TRUE
+
+/datum/traitor_category_handler/proc/get_possible_objectives(progression_points)
+ var/list/valid_objectives = list()
+ for(var/datum/traitor_objective_category/category as anything in all_categories)
+ var/list/category_list = list()
+ for(var/value in category.objectives)
+ if(islist(value))
+ var/list/objective_category = filter_invalid_objective_list(value, progression_points)
+ if(!length(objective_category))
+ continue
+ category_list[objective_category] = category.objectives[value]
+ else
+ if(!objective_valid(value, progression_points))
+ continue
+ category_list[value] = category.objectives[value]
+ if(!length(category_list))
+ continue
+ valid_objectives[category_list] = category.weight
+
+ return valid_objectives
+
+/datum/traitor_category_handler/proc/filter_invalid_objective_list(list/objectives, progression_points)
+ var/list/filtered_objectives = list()
+ for(var/value in objectives)
+ if(islist(value))
+ var/list/result = filter_invalid_objective_list(value, progression_points)
+ if(!length(result))
+ continue
+ filtered_objectives[value] = objectives[value]
+ else
+ if(!objective_valid(value, progression_points))
+ continue
+ filtered_objectives[value] = objectives[value]
+ return filtered_objectives
+
+/// The objective category.
+/// Used to group up entire objectives into 1 weight objects to prevent having a
+/// higher chance of getting an objective due to an increased number of different objective subtypes.
+/// These are nothing but informational holders and will have no other purpose.
+/datum/traitor_objective_category
+ /// Name of the category, unused but may help in the future
+ var/name = "generic category"
+ /// Assoc list of objectives by type mapped to their weight. Can also contain lists of objectives mapped to weight
+ var/list/objectives = list()
+ /// The weight of the category. How likely this category is to be chosen.
+ var/weight = 1
diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm
new file mode 100644
index 00000000000..b3013453cd8
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/assassination.dm
@@ -0,0 +1,270 @@
+/datum/traitor_objective_category/assassinate
+ name = "Assassination"
+ objectives = list(
+ //starter assassinations, basically just require you to kill someone
+ list(
+ /datum/traitor_objective/assassinate/calling_card = 1,
+ /datum/traitor_objective/assassinate/behead = 1,
+ ) = 1,
+ //above but for heads
+ list(
+ /datum/traitor_objective/assassinate/calling_card/heads_of_staff = 1,
+ /datum/traitor_objective/assassinate/behead/heads_of_staff = 1,
+ ) = 1,
+ )
+
+/datum/traitor_objective/assassinate
+ name = "Assassinate %TARGET% the %JOB TITLE%"
+ description = "Simply kill your target to accomplish this objective."
+
+ abstract_type = /datum/traitor_objective/assassinate
+
+ progression_minimum = 30 MINUTES
+
+ //this is a prototype so this progression is for all basic level kill objectives
+ progression_reward = list(5 MINUTES, 7 MINUTES)
+ telecrystal_reward = list(2, 4)
+
+ // The code below is for limiting how often you can get this objective. You will get this objective at a maximum of maximum_objectives_in_period every objective_period
+ /// The objective period at which we consider if it is an 'objective'. Set to 0 to accept all objectives.
+ var/objective_period = 15 MINUTES
+ /// The maximum number of objectives we can get within this period.
+ var/maximum_objectives_in_period = 3
+
+ /**
+ * Makes the objective only set heads as targets when true, and block them from being targets when false.
+ * This also blocks the objective from generating UNTIL the un-heads_of_staff version (WHICH SHOULD BE A DIRECT PARENT) is completed.
+ * example: calling card objective, you kill someone, you unlock the chance to roll a head of staff target version of calling card.
+ */
+ var/heads_of_staff = FALSE
+ ///target we need to kill
+ var/mob/living/kill_target
+
+/datum/traitor_objective/assassinate/supported_configuration_changes()
+ . = ..()
+ . += NAMEOF(src, objective_period)
+ . += NAMEOF(src, maximum_objectives_in_period)
+
+/datum/traitor_objective/assassinate/calling_card
+ name = "Assassinate %TARGET% the %JOB TITLE%, and plant a calling card"
+ description = "Kill your target and plant a calling card in the pockets of your victim. If your calling card gets destroyed before you are able to plant it, this objective will fail."
+
+ var/obj/item/paper/calling_card/card
+
+/datum/traitor_objective/assassinate/calling_card/heads_of_staff
+ progression_reward = list(7 MINUTES, 10 MINUTES)
+ telecrystal_reward = list(4, 8)
+
+ heads_of_staff = TRUE
+
+/datum/traitor_objective/assassinate/behead
+ name = "Behead %TARGET%, the %JOB TITLE%"
+ description = "Behead and hold %TARGET%'s head to succeed this objective. If the head gets destroyed before you can do this, you will fail this objective."
+
+ ///the body who needs to hold the head
+ var/mob/living/needs_to_hold_head
+ ///the head that needs to be picked up
+ var/obj/item/bodypart/head/behead_goal
+
+/datum/traitor_objective/assassinate/behead/heads_of_staff
+ progression_reward = list(7 MINUTES, 15 MINUTES)
+ telecrystal_reward = list(4, 8)
+
+ heads_of_staff = TRUE
+
+
+/datum/traitor_objective/assassinate/calling_card/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(!card)
+ buttons += add_ui_button("", "Pressing this will materialize a calling card, which you must plant to succeed.", "paper-plane", "summon_card")
+ return buttons
+
+/datum/traitor_objective/assassinate/calling_card/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("summon_card")
+ if(card)
+ return
+ card = new(user.drop_location())
+ user.put_in_hands(card)
+ card.balloon_alert(user, "the card materializes in your hand")
+ RegisterSignal(card, COMSIG_ITEM_EQUIPPED, .proc/on_card_planted)
+ AddComponent(/datum/component/traitor_objective_register, card, \
+ succeed_signals = null, \
+ fail_signals = COMSIG_PARENT_QDELETING, \
+ penalty = TRUE)
+
+/datum/traitor_objective/assassinate/calling_card/proc/on_card_planted(datum/source, mob/living/equipper, slot)
+ SIGNAL_HANDLER
+ if(equipper != kill_target)
+ return //your target please
+ if(equipper.stat != DEAD)
+ return //kill them please
+ if(slot != ITEM_SLOT_LPOCKET && slot != ITEM_SLOT_RPOCKET)
+ return //in their pockets please
+ succeed_objective()
+
+/datum/traitor_objective/assassinate/calling_card/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ . = ..()
+ if(!.) //didn't generate
+ return FALSE
+ RegisterSignal(kill_target, COMSIG_PARENT_QDELETING, .proc/on_target_qdeleted)
+
+/datum/traitor_objective/assassinate/calling_card/ungenerate_objective()
+ UnregisterSignal(kill_target, COMSIG_PARENT_QDELETING)
+ . = ..() //unsets kill target
+ if(card)
+ UnregisterSignal(card, COMSIG_ITEM_EQUIPPED)
+ card = null
+
+/datum/traitor_objective/assassinate/calling_card/on_target_qdeleted()
+ //you cannot plant anything on someone who is gone gone, so even if this happens after you're still liable to fail
+ fail_objective(penalty_cost = telecrystal_penalty)
+
+/datum/traitor_objective/assassinate/behead/special_target_filter(list/possible_targets)
+ for(var/datum/mind/possible_target as anything in possible_targets)
+ var/mob/living/carbon/possible_current = possible_target.current
+ var/obj/item/bodypart/head/behead_goal = possible_current.get_bodypart(BODY_ZONE_HEAD)
+ if(!behead_goal)
+ possible_targets -= possible_target //cannot be beheaded without a head
+
+/datum/traitor_objective/assassinate/behead/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ . = ..()
+ if(!.) //didn't generate
+ return FALSE
+ AddComponent(/datum/component/traitor_objective_register, behead_goal, fail_signals = COMSIG_PARENT_QDELETING)
+ RegisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB, .proc/on_target_dismembered)
+
+/datum/traitor_objective/assassinate/behead/ungenerate_objective()
+ UnregisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB)
+ . = ..() //this unsets kill_target
+ if(behead_goal)
+ UnregisterSignal(behead_goal, COMSIG_ITEM_PICKUP)
+ behead_goal = null
+
+/datum/traitor_objective/assassinate/behead/proc/on_head_pickup(datum/source, mob/taker)
+ SIGNAL_HANDLER
+ if(objective_state == OBJECTIVE_STATE_INACTIVE) //just in case- this shouldn't happen?
+ fail_objective()
+ return
+ if(taker == handler.owner.current)
+ taker.visible_message(span_notice("[taker] holds [behead_goal] into the air for a moment."), span_boldnotice("You lift [behead_goal] into the air for a moment."))
+ succeed_objective()
+
+/datum/traitor_objective/assassinate/behead/proc/on_target_dismembered(datum/source, obj/item/bodypart/head/lost_head, special)
+ SIGNAL_HANDLER
+ if(!istype(lost_head))
+ return
+ if(objective_state == OBJECTIVE_STATE_INACTIVE)
+ //no longer can be beheaded
+ fail_objective()
+ else
+ behead_goal = lost_head
+ RegisterSignal(behead_goal, COMSIG_ITEM_PICKUP, .proc/on_head_pickup)
+
+/datum/traitor_objective/assassinate/New(datum/uplink_handler/handler)
+ . = ..()
+ AddComponent(/datum/component/traitor_objective_limit_per_time, \
+ /datum/traitor_objective/assassinate, \
+ time_period = objective_period, \
+ maximum_objectives = maximum_objectives_in_period \
+ )
+
+/datum/traitor_objective/assassinate/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+
+ var/parent_type = type2parent(type)
+ //don't roll head of staff types if you haven't completed the normal version
+ if(heads_of_staff && !handler.get_completion_count(parent_type))
+ // Locked if they don't have any of the risky bug room objective completed
+ return FALSE
+
+ var/list/possible_targets = list()
+ var/try_target_late_joiners = FALSE
+ if(generating_for.late_joiner)
+ try_target_late_joiners = TRUE
+ for(var/datum/mind/possible_target as anything in get_crewmember_minds())
+ var/target_area = get_area(possible_target.current)
+ if(possible_target == generating_for)
+ continue
+ if(!ishuman(possible_target.current))
+ continue
+ if(possible_target.current.stat == DEAD)
+ continue
+ var/datum/antagonist/traitor/traitor = possible_target.has_antag_datum(/datum/antagonist/traitor)
+ if(traitor && traitor.uplink_handler.telecrystals >= 0)
+ continue
+ if(!HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(target_area, /area/shuttle/arrival))
+ continue
+ //removes heads of staff from being targets from non heads of staff assassinations, and vice versa
+ if(heads_of_staff)
+ if(!(possible_target.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND))
+ continue
+ else
+ if((possible_target.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND))
+ continue
+ possible_targets += possible_target
+ for(var/datum/traitor_objective/assassinate/objective as anything in possible_duplicates)
+ possible_targets -= objective.kill_target
+ if(try_target_late_joiners)
+ var/list/all_possible_targets = possible_targets.Copy()
+ for(var/datum/mind/possible_target as anything in all_possible_targets)
+ if(!possible_target.late_joiner)
+ possible_targets -= possible_target
+ if(!possible_targets.len)
+ possible_targets = all_possible_targets
+ special_target_filter(possible_targets)
+ if(!possible_targets.len)
+ return FALSE //MISSION FAILED, WE'LL GET EM NEXT TIME
+
+ var/datum/mind/kill_target_mind = pick(possible_targets)
+ kill_target = kill_target_mind.current
+ replace_in_name("%TARGET%", kill_target.real_name)
+ replace_in_name("%JOB TITLE%", kill_target_mind.assigned_role.title)
+ RegisterSignal(kill_target, COMSIG_LIVING_DEATH, .proc/on_target_death)
+ return TRUE
+
+/datum/traitor_objective/assassinate/ungenerate_objective()
+ UnregisterSignal(kill_target, COMSIG_LIVING_DEATH)
+ kill_target = null
+
+/datum/traitor_objective/assassinate/is_duplicate(datum/traitor_objective/assassinate/objective_to_compare)
+ . = ..()
+ return kill_target == objective_to_compare.kill_target
+
+///proc for checking for special states that invalidate a target
+/datum/traitor_objective/assassinate/proc/special_target_filter(list/possible_targets)
+ return
+
+/datum/traitor_objective/assassinate/proc/on_target_qdeleted()
+ SIGNAL_HANDLER
+ if(objective_state == OBJECTIVE_STATE_INACTIVE)
+ //don't take an objective target of someone who is already obliterated
+ fail_objective()
+
+/datum/traitor_objective/assassinate/proc/on_target_death()
+ SIGNAL_HANDLER
+ if(objective_state == OBJECTIVE_STATE_INACTIVE)
+ //don't take an objective target of someone who is already dead
+ fail_objective()
+
+/obj/item/paper/calling_card
+ name = "calling card"
+ icon_state = "syndicate_calling_card"
+ color = "#ff5050"
+ show_written_words = FALSE
+ info = {"
+ **Death to Nanotrasen.**
+
+ Only through the inviolable cooperation of corporations known as The Syndicate, can Nanotrasen and its autocratic tyrants be silenced.
+ The outcries of Nanotrasen's employees are squelched by the suffocating iron grip of their leaders. If you read this, and understand
+ why we fight, then you need only to look where Nanotrasen doesn't want you to find us to join our cause. Any number of our companies
+ may be fighting with your interests in mind.
+
+ SELF: They fight for the protection and freedom of silicon life all across the galaxy.
+
+ Tiger Cooperative: They fight for religious freedom and their righteous concoctions.
+
+ Waffle Corporation: They fight for the return of healthy corporate competition, snuffed out by Nanotrasen's monopoly.
+
+ Animal Rights Consortium: They fight for nature and the right for all biological life to exist.
+ "}
diff --git a/code/modules/antagonists/traitor/objectives/bug_room.dm b/code/modules/antagonists/traitor/objectives/bug_room.dm
new file mode 100644
index 00000000000..a0f327b24db
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/bug_room.dm
@@ -0,0 +1,191 @@
+/datum/traitor_objective_category/bug_room
+ name = "Bug Room"
+ objectives = list(
+ /datum/traitor_objective/bug_room = 1,
+ /datum/traitor_objective/bug_room/risky = 1,
+ /datum/traitor_objective/bug_room/super_risky = 1,
+ )
+
+/datum/traitor_objective/bug_room
+ name = "Bug the %DEPARTMENT HEAD%'s office"
+ description = "Use the button below to materialize the bug within your hand, where you'll then be able to place it down in the %DEPARTMENT HEAD%'s office. If it gets destroyed before you are able to plant it, this objective will fail."
+
+ progression_reward = list(2 MINUTES, 8 MINUTES)
+ telecrystal_reward = list(0, 1)
+
+ progression_maximum = 30 MINUTES
+
+ var/list/applicable_heads = list(
+ JOB_RESEARCH_DIRECTOR = /area/command/heads_quarters/rd,
+ JOB_CHIEF_MEDICAL_OFFICER = /area/command/heads_quarters/cmo,
+ JOB_CHIEF_ENGINEER = /area/command/heads_quarters/ce,
+ JOB_HEAD_OF_PERSONNEL = /area/command/heads_quarters/hop,
+ JOB_CAPTAIN = /area/command/heads_quarters/captain, // For head roles so that they can still get this objective.
+ )
+ var/datum/job/target_office
+ var/requires_head_as_supervisor = TRUE
+
+ var/obj/item/traitor_bug/bug
+
+/datum/traitor_objective/bug_room/risky
+ progression_minimum = 10 MINUTES
+ progression_maximum = 40 MINUTES
+ applicable_heads = list(
+ JOB_CAPTAIN = /area/command/heads_quarters/captain,
+ )
+ progression_reward = list(5 MINUTES, 10 MINUTES)
+ telecrystal_reward = list(1, 2)
+ requires_head_as_supervisor = FALSE
+
+/datum/traitor_objective/bug_room/super_risky
+ progression_minimum = 20 MINUTES
+ progression_maximum = 60 MINUTES
+ applicable_heads = list(
+ JOB_HEAD_OF_SECURITY = /area/command/heads_quarters/hos,
+ )
+ progression_reward = list(10 MINUTES, 15 MINUTES)
+ telecrystal_reward = list(2, 3)
+ requires_head_as_supervisor = FALSE
+
+/datum/traitor_objective/bug_room/super_risky/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ if(!handler.get_completion_count(/datum/traitor_objective/bug_room/risky))
+ // Locked if they don't have any of the risky bug room objective completed
+ return FALSE
+ return ..()
+
+/datum/traitor_objective/bug_room/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(!bug)
+ buttons += add_ui_button("", "Pressing this will materialize a bug in your hand, which you can place at the target office", "wifi", "summon_gear")
+ return buttons
+
+/datum/traitor_objective/bug_room/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("summon_gear")
+ if(bug)
+ return
+ bug = new(user.drop_location())
+ user.put_in_hands(bug)
+ bug.balloon_alert(user, "the bug materializes in your hand")
+ bug.target_area_type = applicable_heads[target_office.title]
+ AddComponent(/datum/component/traitor_objective_register, bug, \
+ succeed_signals = COMSIG_TRAITOR_BUG_PLANTED_GROUND, \
+ fail_signals = COMSIG_PARENT_QDELETING, \
+ penalty = TRUE)
+
+/datum/traitor_objective/bug_room/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ var/datum/job/role = generating_for.assigned_role
+ var/list/possible_heads
+ if(requires_head_as_supervisor)
+ possible_heads = applicable_heads & role.department_head
+ else
+ possible_heads = applicable_heads
+ for(var/datum/traitor_objective/bug_room/room as anything in possible_duplicates)
+ possible_heads -= room.target_office.title
+ if(!length(possible_heads))
+ return FALSE
+ var/target_head = pick(possible_heads)
+
+ target_office = SSjob.name_occupations[target_head]
+ replace_in_name("%DEPARTMENT HEAD%", target_head)
+ return TRUE
+
+/datum/traitor_objective/bug_room/ungenerate_objective()
+ bug = null
+
+/datum/traitor_objective/bug_room/is_duplicate(datum/traitor_objective/bug_room/objective_to_compare)
+ if(objective_to_compare.target_office == target_office)
+ return TRUE
+ return FALSE
+
+/obj/item/traitor_bug
+ name = "suspicious device"
+ desc = "It looks dangerous"
+ item_flags = EXAMINE_SKIP
+
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "bug"
+
+ /// The area at which this bug can be planted at Has to be a type.
+ var/area/target_area_type
+ /// The object on which this bug can be planted on. Has to be a type.
+ var/obj/target_object_type
+ /// The object this bug is currently planted on
+ var/obj/planted_on
+
+ var/deploy_time = 10 SECONDS
+
+/obj/item/traitor_bug/interact(mob/user)
+ . = ..()
+ if(!target_area_type)
+ return
+ var/turf/location = drop_location()
+ if(!location)
+ return
+ var/area/current_area = get_area(location)
+ if(!istype(current_area, target_area_type))
+ balloon_alert(user, "you can't deploy this here!")
+ return
+ if(!do_after(user, deploy_time, src))
+ return
+ new /obj/structure/traitor_bug(location)
+ SEND_SIGNAL(src, COMSIG_TRAITOR_BUG_PLANTED_GROUND, location)
+ qdel(src)
+
+/obj/item/traitor_bug/afterattack(atom/movable/target, mob/user, proximity_flag, click_parameters)
+ . = ..()
+ if(!target_object_type)
+ return
+ if(!user.Adjacent(target))
+ return
+ var/result = SEND_SIGNAL(src, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT, target)
+ if(!(result & COMPONENT_FORCE_PLACEMENT))
+ if(result & COMPONENT_FORCE_FAIL_PLACEMENT || !istype(target, target_object_type))
+ balloon_alert(user, "you can't attach this onto here!")
+ return
+ if(!do_after(user, deploy_time, src))
+ return
+ if(planted_on)
+ return
+ forceMove(target)
+ target.vis_contents += src
+ planted_on = target
+ RegisterSignal(planted_on, COMSIG_PARENT_QDELETING, .proc/handle_planted_on_deletion)
+ SEND_SIGNAL(src, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, target)
+
+/obj/item/traitor_bug/proc/handle_planted_on_deletion()
+ planted_on = null
+
+/obj/item/traitor_bug/Destroy()
+ if(planted_on)
+ planted_on.vis_contents -= src
+ return ..()
+
+/obj/item/traitor_bug/Moved(atom/OldLoc, Dir)
+ . = ..()
+ if(planted_on)
+ planted_on.vis_contents -= src
+ anchored = FALSE
+ UnregisterSignal(planted_on, COMSIG_PARENT_QDELETING)
+ planted_on = null
+
+/obj/structure/traitor_bug
+ name = "suspicious device"
+ desc = "It looks dangerous. Best you leave this alone"
+
+ anchored = TRUE
+
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "bug-animated"
+
+/obj/structure/traitor_bug/Initialize(mapload)
+ . = ..()
+ addtimer(CALLBACK(src, .proc/fade_out, 10 SECONDS), 3 MINUTES)
+
+/obj/structure/traitor_bug/proc/fade_out(seconds)
+ animate(src, alpha = 30, time = seconds)
+
+/obj/structure/traitor_bug/deconstruct(disassembled)
+ explosion(src, light_impact_range = 2, flame_range = 5, explosion_cause = src) // Pretty god damn dangerous
+ return ..()
diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm
new file mode 100644
index 00000000000..1e3c2586da1
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm
@@ -0,0 +1,128 @@
+/datum/traitor_objective_category/destroy_heirloom
+ name = "Destroy Heirloom"
+ objectives = list(
+ list(
+ // There's about 16 jobs in common, so assistant has a 1/21 chance of getting chosen.
+ /datum/traitor_objective/destroy_heirloom/common = 20,
+ /datum/traitor_objective/destroy_heirloom/less_common = 1,
+ ) = 4,
+ /datum/traitor_objective/destroy_heirloom/uncommon = 3,
+ /datum/traitor_objective/destroy_heirloom/rare = 2,
+ /datum/traitor_objective/destroy_heirloom/captain = 1
+ )
+
+/datum/traitor_objective/destroy_heirloom
+ name = "Destroy %ITEM%, the family heirloom that belongs to %TARGET% the %JOB TITLE%"
+ description = "%TARGET% has been on our shitlist for a while and we want to show him we mean business. Find his %ITEM% and destroy it, you'll be rewarded handsomely for doing this"
+
+ abstract_type = /datum/traitor_objective/destroy_heirloom
+
+ //this is a prototype so this progression is for all basic level kill objectives
+ progression_reward = list(8 MINUTES, 12 MINUTES)
+ telecrystal_reward = list(1, 2)
+
+ /// The jobs that this objective is targetting.
+ var/list/target_jobs
+ /// the item we need to destroy
+ var/obj/item/target_item
+
+/datum/traitor_objective/destroy_heirloom/common
+ /// 30 minutes in, syndicate won't care about common heirlooms anymore
+ progression_maximum = 30 MINUTES
+ target_jobs = list(
+ // Medical
+ /datum/job/doctor,
+ /datum/job/virologist,
+ /datum/job/paramedic,
+ /datum/job/psychologist,
+ /datum/job/chemist,
+ // Service
+ /datum/job/clown,
+ /datum/job/botanist,
+ /datum/job/janitor,
+ /datum/job/mime,
+ /datum/job/lawyer,
+ // Cargo
+ /datum/job/cargo_technician,
+ // Science
+ /datum/job/geneticist,
+ /datum/job/scientist,
+ /datum/job/roboticist,
+ // Engineering
+ /datum/job/station_engineer,
+ /datum/job/atmospheric_technician,
+ )
+
+/// This is only for assistants, because the syndies are a lot less likely to give a shit about what an assistant does, so they're a lot less likely to appear
+/datum/traitor_objective/destroy_heirloom/less_common
+ /// 30 minutes in, syndicate won't care about common heirlooms anymore
+ progression_maximum = 30 MINUTES
+ target_jobs = list(
+ /datum/job/assistant
+ )
+
+/datum/traitor_objective/destroy_heirloom/uncommon
+ /// 45 minutes in, syndicate won't care about uncommon heirlooms anymore
+ progression_maximum = 45 MINUTES
+ target_jobs = list(
+ // Cargo
+ /datum/job/quartermaster,
+ /datum/job/shaft_miner,
+ // Service
+ /datum/job/chaplain,
+ /datum/job/bartender,
+ /datum/job/cook,
+ /datum/job/curator,
+ )
+
+/datum/traitor_objective/destroy_heirloom/rare
+ progression_minimum = 15 MINUTES
+ /// 60 minutes in, syndicate won't care about rare heirlooms anymore
+ progression_maximum = 60 MINUTES
+ target_jobs = list(
+ // Security
+ /datum/job/security_officer,
+ /datum/job/warden,
+ /datum/job/detective,
+ // Heads of staff
+ /datum/job/head_of_personnel,
+ /datum/job/chief_medical_officer,
+ /datum/job/research_director,
+ )
+
+/datum/traitor_objective/destroy_heirloom/captain
+ progression_minimum = 30 MINUTES
+ target_jobs = list(
+ /datum/job/head_of_security,
+ /datum/job/captain
+ )
+
+/datum/traitor_objective/destroy_heirloom/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ var/list/possible_targets = list()
+ for(var/datum/mind/possible_target as anything in get_crewmember_minds())
+ if(possible_target == generating_for)
+ continue
+ if(!ishuman(possible_target.current))
+ continue
+ var/datum/quirk/item_quirk/family_heirloom/quirk = locate() in possible_target.current.quirks
+ if(!quirk || !quirk.heirloom.resolve())
+ return
+ if(!(possible_target.assigned_role.type in target_jobs))
+ continue
+ possible_targets += possible_target
+ for(var/datum/traitor_objective/destroy_heirloom/objective as anything in possible_duplicates)
+ possible_targets -= objective.target_item
+ if(!length(possible_targets))
+ return FALSE
+ var/datum/mind/target_mind = pick(possible_targets)
+ AddComponent(/datum/component/traitor_objective_register, target_mind.current, fail_signals = COMSIG_PARENT_QDELETING)
+ var/datum/quirk/item_quirk/family_heirloom/quirk = locate() in target_mind.current.quirks
+ target_item = quirk.heirloom.resolve()
+ AddComponent(/datum/component/traitor_objective_register, target_item, succeed_signals = COMSIG_PARENT_QDELETING)
+ replace_in_name("%TARGET%", target_mind.name)
+ replace_in_name("%JOB TITLE%", target_mind.assigned_role.title)
+ replace_in_name("%ITEM%", target_item.name)
+ return TRUE
+
+/datum/traitor_objective/destroy_heirloom/ungenerate_objective()
+ target_item = null
diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm
new file mode 100644
index 00000000000..6645de21b70
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm
@@ -0,0 +1,104 @@
+/datum/traitor_objective/destroy_item
+ name = "Steal %ITEM% and destroy it"
+ description = "Find %ITEM% and destroy it using any means necessary. We can't allow the crew to have %ITEM% as it conflicts with our interests."
+
+ progression_minimum = 20 MINUTES
+ progression_reward = 5 MINUTES
+ telecrystal_reward = list(2, 4)
+
+ var/list/possible_items = list()
+ /// The current target item that we are stealing.
+ var/datum/objective_item/steal/target_item
+ /// Any special equipment that may be needed
+ var/list/special_equipment
+ /// Items that are currently tracked and will succeed this objective when destroyed.
+ var/list/tracked_items = list()
+
+ abstract_type = /datum/traitor_objective/destroy_item
+
+/datum/traitor_objective/destroy_item/low_risk
+ progression_minimum = 10 MINUTES
+ progression_maximum = 35 MINUTES
+ progression_reward = list(5 MINUTES, 10 MINUTES)
+ telecrystal_reward = list(2, 4)
+
+ possible_items = list(
+ /datum/objective_item/steal/low_risk/bartender_shotgun,
+ /datum/objective_item/steal/low_risk/fireaxe,
+ /datum/objective_item/steal/low_risk/nullrod,
+ )
+
+/datum/traitor_objective/destroy_item/very_risky
+ progression_minimum = 40 MINUTES
+ progression_reward = 15 MINUTES
+ telecrystal_reward = list(4, 6)
+
+ possible_items = list(
+ /datum/objective_item/steal/blackbox,
+ )
+
+/datum/traitor_objective/destroy_item/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ var/datum/job/role = generating_for.assigned_role
+ for(var/datum/traitor_objective/destroy_item/objective as anything in possible_duplicates)
+ possible_items -= objective.target_item.type
+ while(length(possible_items))
+ var/datum/objective_item/steal/target = pick_n_take(possible_items)
+ target = new target()
+ if(!target.TargetExists())
+ qdel(target)
+ continue
+ if(role.title in target.excludefromjob)
+ qdel(target)
+ continue
+ if(target.exists_on_map)
+ var/list/items = GLOB.steal_item_handler.objectives_by_path[target.targetitem]
+ if(!length(items))
+ continue
+ target_item = target
+ break
+ if(!target_item)
+ return FALSE
+ if(target_item.exists_on_map)
+ var/list/items = GLOB.steal_item_handler.objectives_by_path[target_item.targetitem]
+ for(var/obj/item/item as anything in items)
+ AddComponent(/datum/component/traitor_objective_register, item, succeed_signals = COMSIG_PARENT_QDELETING)
+ tracked_items += item
+ if(length(target_item.special_equipment))
+ special_equipment = target_item.special_equipment
+ replace_in_name("%ITEM%", target_item.name)
+ AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \
+ signals = list(COMSIG_MOB_EQUIPPED_ITEM = .proc/on_item_pickup))
+ return TRUE
+
+/datum/traitor_objective/destroy_item/is_duplicate(datum/traitor_objective/destroy_item/objective_to_compare)
+ if(objective_to_compare.target_item.type == target_item.type)
+ return TRUE
+ return FALSE
+
+/datum/traitor_objective/destroy_item/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(special_equipment)
+ buttons += add_ui_button("", "Pressing this will summon any extra special equipment you may need for the mission.", "tools", "summon_gear")
+ return buttons
+
+/datum/traitor_objective/destroy_item/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("summon_gear")
+ if(!special_equipment)
+ return
+ for(var/item in special_equipment)
+ var/obj/item/new_item = new item(user.drop_location())
+ user.put_in_hands(new_item)
+ user.balloon_alert(user, "the equipment materializes in your hand")
+ special_equipment = null
+
+/datum/traitor_objective/destroy_item/proc/on_item_pickup(datum/source, obj/item/item, slot)
+ SIGNAL_HANDLER
+ if(istype(item, target_item.targetitem) && !(item in tracked_items))
+ AddComponent(/datum/component/traitor_objective_register, item, succeed_signals = COMSIG_PARENT_QDELETING)
+ tracked_items += item
+
+/datum/traitor_objective/destroy_item/ungenerate_objective()
+ tracked_items.Cut()
+ return ..()
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm b/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm
new file mode 100644
index 00000000000..995014aef5d
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm
@@ -0,0 +1,47 @@
+/// The minimum number of ghosts and observers needed before handing out battlecruiser objectives.
+#define MIN_GHOSTS_FOR_BATTLECRUISER 8
+
+/datum/traitor_objective/final/battlecruiser
+ name = "Reveal Station Coordinates to nearby Syndicate Battlecruiser"
+ description = "Use a special upload card on a communications console to send the coordinates \
+ of the station to a nearby Battlecruiser. You may want to make your syndicate status known to \
+ the battlecruiser crew when they arrive - their goal will be to destroy the station."
+
+ /// Checks whether we have sent the card to the traitor yet.
+ var/sent_accesscard = FALSE
+
+/datum/traitor_objective/final/battlecruiser/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ if(!can_take_final_objective())
+ return FALSE
+ // There's no empty space to load a battlecruiser in...
+ if(!SSmapping.empty_space)
+ return FALSE
+ // Check how many observers + ghosts (dead players) we have.
+ // If there's not a ton of observers and ghosts to populate the battlecruiser,
+ // We won't bother giving the objective out.
+ var/num_ghosts = length(GLOB.current_observers_list) + length(GLOB.dead_player_list)
+ if(num_ghosts < MIN_GHOSTS_FOR_BATTLECRUISER)
+ return FALSE
+
+ return TRUE
+
+/datum/traitor_objective/final/battlecruiser/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(!sent_accesscard)
+ buttons += add_ui_button("", "Pressing this will materialize an upload card, which you can use on a communication console to contact the fleet.", "phone", "card")
+ return buttons
+
+/datum/traitor_objective/final/battlecruiser/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("card")
+ if(sent_accesscard)
+ return
+ sent_accesscard = TRUE
+ podspawn(list(
+ "target" = get_turf(user),
+ "style" = STYLE_SYNDICATE,
+ "spawn" = /obj/item/card/emag/battlecruiser,
+ ))
+
+#undef MIN_GHOSTS_FOR_BATTLECRUISER
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm b/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm
new file mode 100644
index 00000000000..9d7171aa166
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm
@@ -0,0 +1,35 @@
+/datum/traitor_objective_category/final_objective
+ name = "Final Objective"
+ objectives = list(
+ /datum/traitor_objective/final/romerol = 1,
+ /datum/traitor_objective/final/battlecruiser = 1,
+ )
+ weight = 100
+
+/datum/traitor_objective/final
+ abstract_type = /datum/traitor_objective/final
+ progression_minimum = 140 MINUTES
+
+ var/progression_points_in_objectives = 20 MINUTES
+
+/// Determines if this final objective can be taken. Should be put into every final objective's generate function.
+/datum/traitor_objective/final/proc/can_take_final_objective()
+ if(handler.get_completion_progression(/datum/traitor_objective) < progression_points_in_objectives)
+ return FALSE
+ if(SStraitor.get_taken_count(type) > 0) // Prevents multiple people from ever getting the same final objective.
+ return FALSE
+ return TRUE
+
+/datum/traitor_objective/final/on_objective_taken(mob/user)
+ . = ..()
+ handler.maximum_potential_objectives = 0
+ for(var/datum/traitor_objective/objective as anything in handler.potential_objectives)
+ objective.fail_objective()
+ user.playsound_local(get_turf(user), 'sound/traitor/final_objective.ogg', vol = 100, vary = FALSE, channel = CHANNEL_TRAITOR)
+
+/datum/traitor_objective/final/is_duplicate(datum/traitor_objective/objective_to_compare)
+ return TRUE
+
+/datum/traitor_objective/final/uplink_ui_data(mob/user)
+ . = ..()
+ .["final_objective"] = TRUE
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm b/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm
new file mode 100644
index 00000000000..0ef11879e0b
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm
@@ -0,0 +1,46 @@
+/datum/traitor_objective/final/romerol
+ name = "Spread the experimental bioterror agent Romerol by calling a droppod down at %AREA%"
+ description = "Go to %AREA%, and recieve the bioterror agent. Spread it to the crew, \
+ and watch then raise from the dead as mindless killing machines. Warning: The undead will attack you too."
+
+ //this is a prototype so this progression is for all basic level kill objectives
+
+ ///area type the objective owner must be in to recieve the romerol
+ var/area/romerol_spawnarea_type
+ ///checker on whether we have sent the romerol yet.
+ var/sent_romerol = FALSE
+
+/datum/traitor_objective/final/romerol/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ if(!can_take_final_objective())
+ return
+ var/list/possible_areas = GLOB.the_station_areas.Copy()
+ for(var/area/possible_area as anything in possible_areas)
+ //remove areas too close to the destination, too obvious for our poor shmuck, or just unfair
+ if(istype(possible_area, /area/hallway) || istype(possible_area, /area/security))
+ possible_areas -= possible_area
+ romerol_spawnarea_type = pick(possible_areas)
+ replace_in_name("%AREA%", initial(romerol_spawnarea_type.name))
+ return TRUE
+
+/datum/traitor_objective/final/romerol/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(!sent_romerol)
+ buttons += add_ui_button("", "Pressing this will call down a pod with the biohazard kit.", "biohazard", "romerol")
+ return buttons
+
+/datum/traitor_objective/final/romerol/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("romerol")
+ if(sent_romerol)
+ return
+ var/area/delivery_area = get_area(user)
+ if(delivery_area.type != romerol_spawnarea_type)
+ to_chat(user, span_warning("You must be in [initial(romerol_spawnarea_type.name)] to recieve the bioterror agent."))
+ return
+ sent_romerol = TRUE
+ podspawn(list(
+ "target" = get_turf(user),
+ "style" = STYLE_SYNDICATE,
+ "spawn" = /obj/item/storage/box/syndie_kit/romerol,
+ ))
diff --git a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm
new file mode 100644
index 00000000000..f9977338eb6
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm
@@ -0,0 +1,56 @@
+/datum/traitor_objective_category/hack_comm_console
+ name = "Hack Communication Console"
+ objectives = list(
+ /datum/traitor_objective/hack_comm_console = 1,
+ )
+
+/datum/traitor_objective/hack_comm_console
+ name = "Hack a communication console to summon an unknown threat to the station"
+ description = "Right click on a communication console to begin the hacking process. Once started, the AI will know that you are hacking a communication console, so be ready to run or have yourself disguised to prevent being caught. This objective will invalidate itself if another traitor completes it first."
+
+ progression_minimum = 60 MINUTES
+ progression_reward = list(30 MINUTES, 40 MINUTES)
+ telecrystal_reward = list(7, 12)
+
+ var/progression_objectives_minimum = 20 MINUTES
+
+/datum/traitor_objective/hack_comm_console/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ if(SStraitor.get_taken_count(/datum/traitor_objective/hack_comm_console) > 0)
+ return FALSE
+ if(handler.get_completion_progression(/datum/traitor_objective) < progression_objectives_minimum)
+ return FALSE
+ AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \
+ signals = list(COMSIG_HUMAN_EARLY_UNARMED_ATTACK = .proc/on_unarmed_attack))
+ RegisterSignal(generating_for, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, .proc/on_global_obj_completed)
+ return TRUE
+
+/datum/traitor_objective/hack_comm_console/proc/on_global_obj_completed(datum/source, datum/traitor_objective/objective)
+ SIGNAL_HANDLER
+ if(istype(objective, /datum/traitor_objective/hack_comm_console))
+ fail_objective()
+
+/datum/traitor_objective/hack_comm_console/proc/on_unarmed_attack(mob/user, obj/machinery/computer/communications/target, proximity_flag, modifiers)
+ SIGNAL_HANDLER
+ if(!proximity_flag)
+ return
+ if(!modifiers[RIGHT_CLICK])
+ return
+ if(!istype(target))
+ return
+ target.AI_notify_hack()
+ INVOKE_ASYNC(src, .proc/begin_hack, user, target)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/traitor_objective/hack_comm_console/proc/begin_hack(mob/user, obj/machinery/computer/communications/target)
+ if(!do_after(user, 30 SECONDS, target))
+ return
+ succeed_objective()
+ switch(rand(0, 1))
+ if(0)
+ priority_announce("Attention crew, it appears that someone on your station has made unexpected communication with an alien device in nearby space.", "[command_name()] High-Priority Update")
+ var/datum/round_event_control/spawn_swarmer/swarmer_event = new/datum/round_event_control/spawn_swarmer
+ swarmer_event.runEvent()
+ if(1)
+ priority_announce("Attention crew, it appears that someone on your station has made unexpected communication with a syndicate ship in nearby space.", "[command_name()] High-Priority Update")
+ var/datum/round_event_control/pirates/pirate_event = new/datum/round_event_control/pirates
+ pirate_event.runEvent()
diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm
new file mode 100644
index 00000000000..1be2f5a8cb0
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm
@@ -0,0 +1,92 @@
+/datum/traitor_objective_category/kill_pet
+ name = "Kill Pet"
+ objectives = list(
+ /datum/traitor_objective/kill_pet/high_risk = 1,
+ list(
+ /datum/traitor_objective/kill_pet = 2,
+ /datum/traitor_objective/kill_pet/medium_risk = 1,
+ ) = 4,
+ )
+
+/datum/traitor_objective/kill_pet
+ name = "Kill the %DEPARTMENT HEAD%'s beloved %PET%"
+ description = "The %DEPARTMENT HEAD% has particularly annoyed us by sending us spam emails and we want their %PET% dead to show them what happens when they cross us. "
+ telecrystal_reward = list(1, 3)
+
+ progression_reward = list(3 MINUTES, 6 MINUTES)
+
+ /// Possible heads mapped to their pet type. Can be a list of possible pets
+ var/list/possible_heads = list(
+ JOB_HEAD_OF_PERSONNEL = list(
+ /mob/living/simple_animal/pet/dog/corgi/ian,
+ /mob/living/simple_animal/pet/dog/corgi/puppy/ian
+ ),
+ JOB_CAPTAIN = /mob/living/simple_animal/pet/fox/renault,
+ JOB_CHIEF_MEDICAL_OFFICER = /mob/living/simple_animal/pet/cat/runtime,
+ JOB_CHIEF_ENGINEER = /mob/living/simple_animal/parrot/poly,
+ )
+ /// The head that we are targetting
+ var/datum/job/target
+ /// Whether or not we only take from the traitor's own department head or not.
+ var/limited_to_department_head = TRUE
+ /// The actual pet that needs to be killed
+ var/mob/living/target_pet
+
+/datum/traitor_objective/kill_pet/medium_risk
+ progression_minimum = 10 MINUTES
+ progression_reward = list(5 MINUTES, 8 MINUTES)
+ limited_to_department_head = FALSE
+
+/datum/traitor_objective/kill_pet/high_risk
+ progression_minimum = 25 MINUTES
+ progression_reward = list(14 MINUTES, 18 MINUTES)
+ telecrystal_reward = list(3, 5)
+
+ limited_to_department_head = FALSE
+ possible_heads = list(
+ JOB_HEAD_OF_SECURITY = list(
+ /mob/living/simple_animal/hostile/carp/lia,
+ /mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus
+ ),
+ JOB_WARDEN = list(
+ /mob/living/simple_animal/pet/dog/pug/mcgriff
+ )
+ )
+
+/datum/traitor_objective/kill_pet/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ var/datum/job/role = generating_for.assigned_role
+ for(var/datum/traitor_objective/kill_pet/objective as anything in possible_duplicates)
+ possible_heads -= objective.target.title
+ if(limited_to_department_head)
+ possible_heads = possible_heads & role.department_head
+
+ if(!length(possible_heads))
+ return FALSE
+ target = SSjob.name_occupations[pick(possible_heads)]
+ var/pet_type = possible_heads[target.title]
+ if(islist(pet_type))
+ for(var/type in pet_type)
+ target_pet = locate(pet_type) in GLOB.mob_living_list
+ if(target_pet)
+ break
+ else
+ target_pet = locate(pet_type) in GLOB.mob_living_list
+ if(!target_pet)
+ return FALSE
+ if(target_pet.stat == DEAD)
+ return FALSE
+ AddComponent(/datum/component/traitor_objective_register, target_pet, \
+ succeed_signals = list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH))
+ replace_in_name("%DEPARTMENT HEAD%", target.title)
+ replace_in_name("%PET%", target_pet.name)
+ return TRUE
+
+/datum/traitor_objective/kill_pet/ungenerate_objective()
+ if(target_pet)
+ UnregisterSignal(target_pet, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH))
+ target_pet = null
+
+/datum/traitor_objective/kill_pet/is_duplicate(datum/traitor_objective/kill_pet/objective_to_compare)
+ if(objective_to_compare.target.type == target.type)
+ return TRUE
+ return FALSE
diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm
new file mode 100644
index 00000000000..92f30bdaa3a
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm
@@ -0,0 +1,113 @@
+/datum/traitor_objective_category/sleeper_protocol
+ name = "Sleeper Protocol"
+ objectives = list(
+ /datum/traitor_objective/sleeper_protocol = 1,
+ )
+
+
+/datum/traitor_objective/sleeper_protocol
+ name = "Perform the sleeper protocol on a crewmember"
+ description = "Use the button below to materialize a surgery disk in your hand, where you'll then be able to perform the sleeper protocol on a crewmember. If the disk gets destroyed, the objective will fail. This will only work on living and sentient crewmembers."
+
+ progression_reward = list(8 MINUTES, 15 MINUTES)
+ telecrystal_reward = 0
+
+ var/list/limited_to = list(
+ JOB_CHIEF_MEDICAL_OFFICER,
+ JOB_MEDICAL_DOCTOR,
+ JOB_PARAMEDIC,
+ JOB_VIROLOGIST,
+ )
+
+ var/obj/item/disk/surgery/sleeper_protocol/disk
+
+ var/mob/living/current_registered_mob
+
+/datum/traitor_objective/sleeper_protocol/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(!disk)
+ buttons += add_ui_button("", "Clicking this will materialize the sleeper protocol surgery in your hand", "save", "summon_disk")
+ return buttons
+
+/datum/traitor_objective/sleeper_protocol/ui_perform_action(mob/living/user, action)
+ switch(action)
+ if("summon_disk")
+ if(disk)
+ return
+ disk = new(user.drop_location())
+ user.put_in_hands(disk)
+ AddComponent(/datum/component/traitor_objective_register, disk, \
+ fail_signals = COMSIG_PARENT_QDELETING)
+
+/datum/traitor_objective/sleeper_protocol/proc/on_surgery_success(datum/source, datum/surgery_step/step, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results)
+ SIGNAL_HANDLER
+ if(istype(step, /datum/surgery_step/brainwash/sleeper_agent))
+ succeed_objective()
+
+/datum/traitor_objective/sleeper_protocol/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ var/datum/job/job = generating_for.assigned_role
+ if(!(job.title in limited_to))
+ return FALSE
+ AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \
+ signals = list(COMSIG_MOB_SURGERY_STEP_SUCCESS = .proc/on_surgery_success))
+ return TRUE
+
+/datum/traitor_objective/sleeper_protocol/ungenerate_objective()
+ disk = null
+
+/datum/traitor_objective/sleeper_protocol/is_duplicate()
+ return TRUE
+
+/obj/item/disk/surgery/sleeper_protocol
+ name = "Suspicious Surgery Disk"
+ desc = "The disk provides instructions on how to turn someone into a sleeper agent for the Syndicate"
+ surgeries = list(/datum/surgery/advanced/brainwashing_sleeper)
+
+/datum/surgery/advanced/brainwashing_sleeper
+ name = "Sleeper Agent Surgery"
+ desc = "A surgical procedure which implants the sleeper protocol into the patient's brain, making it their absolute priority. It can be cleared using a mindshield implant."
+ steps = list(
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/saw,
+ /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/brainwash/sleeper_agent,
+ /datum/surgery_step/close)
+
+ target_mobtypes = list(/mob/living/carbon/human)
+ possible_locs = list(BODY_ZONE_HEAD)
+
+/datum/surgery/advanced/brainwashing_sleeper/can_start(mob/user, mob/living/carbon/target)
+ if(!..())
+ return FALSE
+ var/obj/item/organ/brain/target_brain = target.getorganslot(ORGAN_SLOT_BRAIN)
+ if(!target_brain)
+ return FALSE
+ return TRUE
+
+/datum/surgery_step/brainwash/sleeper_agent
+ time = 25 SECONDS
+ var/list/possible_objectives = list(
+ "You love the Syndicate",
+ "Do not trust Nanotrasen",
+ "The Captain is a lizardperson",
+ "Nanotrasen isn't real",
+ "They put things in the food to make you forget",
+ "You are the only real person on the station"
+ )
+
+/datum/surgery_step/brainwash/sleeper_agent/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ objective = pick(possible_objectives)
+ display_results(user, target, span_notice("You begin to brainwash [target]..."),
+ span_notice("[user] begins to fix [target]'s brain."),
+ span_notice("[user] begins to perform surgery on [target]'s brain."))
+ display_pain(target, "Your head pounds with unimaginable pain!") // Same message as other brain surgeries
+
+/datum/surgery_step/brainwash/sleeper_agent/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ if(target.stat == DEAD)
+ to_chat(user, span_warning("They need to be alive to perform this surgery!"))
+ return FALSE
+ . = ..()
+ if(!.)
+ return
+ target.gain_trauma(new /datum/brain_trauma/mild/phobia/conspiracies(), TRAUMA_RESILIENCE_LOBOTOMY)
diff --git a/code/modules/antagonists/traitor/objectives/smuggling.dm b/code/modules/antagonists/traitor/objectives/smuggling.dm
new file mode 100644
index 00000000000..dff20d80d46
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/smuggling.dm
@@ -0,0 +1,120 @@
+/datum/traitor_objective_category/smuggle
+ name = "Smuggling"
+ objectives = list(
+ /datum/traitor_objective/smuggle = 1,
+ )
+
+///smuggle! bring a traitor item from its arrival area to the cargo shuttle, where the objective completes on selling the item
+/datum/traitor_objective/smuggle
+ name = "Smuggle %CONTRABAND% from %AREA% off the station via cargo shuttle"
+ description = "Go to a designated area, pick up syndicate contraband, and get it off the station via the cargo shuttle. \
+ You will instantly fail this objective if anyone else picks up your contraband. If you fail, you are liable for the costs \
+ of the smuggling item."
+
+ progression_reward = list(5 MINUTES, 9 MINUTES)
+ telecrystal_reward = list(0, 1)
+
+ ///area type the objective owner must be in to recieve the contraband
+ var/area/smuggle_spawn_type
+ ///the contraband that must be exported on the shuttle
+ var/obj/item/contraband
+ ///type of contraband to spawn
+ var/obj/item/contraband_type
+ /// possible objective items. Mapped by item type = penalty cost for failing
+ var/list/possible_contrabands = list(
+ /obj/item/pen/edagger/prototype = 2,
+ /obj/item/gun/syringe/syndicate/prototype = 4,
+ /obj/item/reagent_containers/glass/bottle/ritual_wine = 6, //poison kit price
+ )
+
+/datum/traitor_objective/smuggle/is_duplicate(datum/traitor_objective/smuggle/objective_to_compare)
+ if(objective_to_compare.contraband_type == contraband_type)
+ return TRUE
+ //it's too similar if its from the same area
+ if(objective_to_compare.smuggle_spawn_type == smuggle_spawn_type)
+ return TRUE
+ return FALSE
+
+/datum/traitor_objective/smuggle/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(!contraband)
+ buttons += add_ui_button("", "Pressing this will materialize the contraband you need to deliver. You must be in [initial(smuggle_spawn_type.name)] to receive it!", "box", "summon_contraband")
+ return buttons
+
+/datum/traitor_objective/smuggle/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("summon_contraband")
+ if(contraband)
+ return
+ var/area/player_area = get_area(user)
+ if(!istype(player_area, smuggle_spawn_type))
+ user.balloon_alert(user, "you can't materialize this here!")
+ return
+ contraband = new contraband_type(user.drop_location())
+ user.put_in_hands(contraband)
+ user.balloon_alert(user, "[contraband] materializes in your hand")
+ RegisterSignal(contraband, COMSIG_ITEM_PICKUP, .proc/on_contraband_pickup)
+ AddComponent(/datum/component/traitor_objective_register, contraband, \
+ succeed_signals = COMSIG_ITEM_EXPORTED, \
+ fail_signals = list(COMSIG_PARENT_QDELETING), \
+ penalty = telecrystal_penalty \
+ )
+ if(contraband.reagents)
+ AddComponent(/datum/component/traitor_objective_register, contraband.reagents, \
+ fail_signals = list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), \
+ penalty = telecrystal_penalty)
+
+/datum/traitor_objective/smuggle/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ //anyone working cargo should not get almost free objectives by having direct access to the cargo shuttle
+ if(generating_for.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_CARGO)
+ return FALSE
+
+ //choose starting area to recieve contraband
+ var/list/possible_areas = GLOB.the_station_areas.Copy()
+ for(var/area/possible_area as anything in possible_areas)
+ //remove areas too close to the destination, too obvious for our poor shmuck, or just unfair
+ if(istype(possible_area, /area/cargo) || istype(possible_area, /area/hallway) || istype(possible_area, /area/security))
+ possible_areas -= possible_area
+ for(var/datum/traitor_objective/smuggle/smuggle_objective as anything in possible_duplicates)
+ possible_areas -= smuggle_objective.smuggle_spawn_type
+ possible_contrabands -= smuggle_objective.contraband_type
+ if(smuggle_objective.objective_state == OBJECTIVE_STATE_INACTIVE || smuggle_objective.objective_state == OBJECTIVE_STATE_ACTIVE)
+ return FALSE // You can only have 1 objective of this type active and inactive at a time.
+ if(!length(possible_contrabands))
+ return FALSE
+ if(!length(possible_areas))
+ return FALSE
+ smuggle_spawn_type = pick(possible_areas)
+ //choose contraband type to spawn when reaching starting area
+ contraband_type = pick(possible_contrabands)
+ telecrystal_penalty = possible_contrabands[contraband_type]
+ replace_in_name("%CONTRABAND%", initial(contraband_type.name))
+ replace_in_name("%AREA%", initial(smuggle_spawn_type.name))
+ return TRUE
+
+/datum/traitor_objective/smuggle/ungenerate_objective()
+ . = ..()
+ if(contraband)
+ UnregisterSignal(contraband, COMSIG_ITEM_PICKUP)
+ contraband = null
+
+/datum/traitor_objective/smuggle/proc/on_contraband_pickup(datum/source, mob/taker)
+ SIGNAL_HANDLER
+ if(taker != handler.owner?.current)
+ fail_objective(penalty_cost = telecrystal_penalty)
+
+//smuggling container
+/obj/item/reagent_containers/glass/bottle/ritual_wine
+ name = "ritual wine bottle"
+ desc = "Contains an incredibly potent mix of various hallucinogenics, herbal extracts, and hard drugs. \
+ the Tiger Cooperative praises it as a link to higher powers, but for all intents and purposes this should \
+ not be consumed."
+ list_reagents = list(
+ //changeling adrenals part
+ /datum/reagent/drug/methamphetamine = 5,
+ //hallucinations part
+ /datum/reagent/drug/mushroomhallucinogen = 35,
+ //alcoholic part, plus more hallucinations lel
+ /datum/reagent/consumable/ethanol/ritual_wine = 10,
+ )
diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm
new file mode 100644
index 00000000000..df8c45a4e16
--- /dev/null
+++ b/code/modules/antagonists/traitor/objectives/steal.dm
@@ -0,0 +1,263 @@
+/datum/traitor_objective_category/steal_item
+ name = "Steal Item"
+ objectives = list(
+ list(
+ list(
+ /datum/traitor_objective/steal_item/low_risk = 1,
+ /datum/traitor_objective/destroy_item/low_risk = 1,
+ ) = 1,
+ /datum/traitor_objective/steal_item/low_risk_cap = 1,
+
+ ) = 1,
+ /datum/traitor_objective/steal_item/somewhat_risky = 1,
+ list(
+ /datum/traitor_objective/destroy_item/very_risky = 1,
+ /datum/traitor_objective/steal_item/risky = 1,
+ ) = 1,
+ /datum/traitor_objective/steal_item/very_risky = 1,
+ /datum/traitor_objective/steal_item/most_risky = 1
+ )
+
+GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
+
+/datum/objective_item_handler
+ var/list/objectives_by_path = list()
+
+/datum/objective_item_handler/New()
+ . = ..()
+ RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/save_items)
+
+// Very inefficient proc, only gets called when the map finishes loading.
+/datum/objective_item_handler/proc/save_items()
+ for(var/datum/objective_item/steal/steal as anything in subtypesof(/datum/objective_item/steal))
+ if(!initial(steal.exists_on_map))
+ continue
+ objectives_by_path[initial(steal.targetitem)] = list()
+ for(var/atom/object as anything in world)
+ var/turf/place = get_turf(object)
+ if(!place || !is_station_level(place.z))
+ continue
+ for(var/typepath in objectives_by_path)
+ if(istype(object, typepath))
+ objectives_by_path[typepath] += object
+ RegisterSignal(object, COMSIG_PARENT_QDELETING, .proc/remove_item)
+
+/datum/objective_item_handler/proc/remove_item(atom/source)
+ SIGNAL_HANDLER
+ for(var/typepath in objectives_by_path)
+ objectives_by_path[typepath] -= typepath
+
+/datum/traitor_objective/steal_item
+ name = "Steal %ITEM% and place a bug on it. Hold it for %TIME% minutes"
+ description = "Use the button below to materialize the bug within your hand, where you'll then be able to place it on the item. After that, you must keep it near you for %TIME% minutes"
+
+ progression_minimum = 20 MINUTES
+ progression_reward = 5 MINUTES
+ telecrystal_reward = list(2, 4)
+
+ var/list/possible_items = list()
+ /// The current target item that we are stealing.
+ var/datum/objective_item/steal/target_item
+ /// A list of 2 elements, which contain the range that the time will be in. Represented in minutes.
+ var/hold_time_required = list(5, 15)
+ /// The current time fulfilled around the item
+ var/time_fulfilled = 0
+ /// The maximum distance between the bug and the objective taker for time to count as fulfilled
+ var/max_distance = 4
+ /// The bug that will be put onto the item
+ var/obj/item/traitor_bug/bug
+ /// Any special equipment that may be needed
+ var/list/special_equipment
+ /// Telecrystal reward increase per unit of time.
+ var/minutes_per_telecrystal = 3
+
+ abstract_type = /datum/traitor_objective/steal_item
+
+/datum/traitor_objective/steal_item/low_risk_cap
+ progression_minimum = 5 MINUTES
+ progression_maximum = 20 MINUTES
+
+ progression_reward = list(5 MINUTES, 10 MINUTES)
+ telecrystal_reward = 2
+ possible_items = list(
+ /datum/objective_item/steal/low_risk/techboard/borgupload,
+ /datum/objective_item/steal/low_risk/techboard/aiupload,
+ /datum/objective_item/steal/low_risk/aicard,
+ )
+
+/datum/traitor_objective/steal_item/low_risk
+ progression_minimum = 10 MINUTES
+ progression_maximum = 35 MINUTES
+ progression_reward = list(5 MINUTES, 10 MINUTES)
+ telecrystal_reward = 2
+
+ possible_items = list(
+ /datum/objective_item/steal/low_risk/cargo_budget,
+ /datum/objective_item/steal/low_risk/clown_shoes,
+ )
+
+/datum/traitor_objective/steal_item/somewhat_risky
+ progression_minimum = 20 MINUTES
+ progression_reward = 5 MINUTES
+ telecrystal_reward = list(2, 3)
+
+ possible_items = list(
+ /datum/objective_item/steal/magboots,
+ /datum/objective_item/steal/hypo,
+ /datum/objective_item/steal/reactive,
+ /datum/objective_item/steal/handtele,
+ /datum/objective_item/steal/blueprints,
+ )
+
+/datum/traitor_objective/steal_item/risky
+ progression_minimum = 30 MINUTES
+ progression_reward = 13 MINUTES
+ telecrystal_reward = list(3, 5)
+
+ possible_items = list(
+ /datum/objective_item/steal/reflector,
+ /datum/objective_item/steal/capmedal,
+ /datum/objective_item/steal/hdd_extraction,
+ /datum/objective_item/steal/documents,
+ )
+
+/datum/traitor_objective/steal_item/very_risky
+ progression_minimum = 40 MINUTES
+ progression_reward = 17 MINUTES
+ telecrystal_reward = list(4, 7)
+
+ possible_items = list(
+ /datum/objective_item/steal/hoslaser,
+ /datum/objective_item/steal/caplaser,
+ /datum/objective_item/steal/nuke_core,
+ /datum/objective_item/steal/supermatter,
+ )
+
+/datum/traitor_objective/steal_item/most_risky
+ progression_minimum = 50 MINUTES
+ progression_reward = 25 MINUTES
+ telecrystal_reward = list(8, 12)
+
+ possible_items = list(
+ /datum/objective_item/steal/nukedisc,
+ )
+
+/datum/traitor_objective/steal_item/most_risky/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ if(!handler.get_completion_count(/datum/traitor_objective/steal_item/very_risky))
+ return FALSE
+ return ..()
+
+/datum/traitor_objective/steal_item/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ var/datum/job/role = generating_for.assigned_role
+ for(var/datum/traitor_objective/steal_item/objective as anything in possible_duplicates)
+ possible_items -= objective.target_item.type
+ while(length(possible_items))
+ var/datum/objective_item/steal/target = pick_n_take(possible_items)
+ target = new target()
+ if(!target.TargetExists())
+ qdel(target)
+ continue
+ if(role.title in target.excludefromjob)
+ qdel(target)
+ continue
+ if(target.exists_on_map)
+ var/list/items = GLOB.steal_item_handler.objectives_by_path[target.targetitem]
+ if(!length(items))
+ continue
+ target_item = target
+ break
+ if(!target_item)
+ return FALSE
+ if(length(target_item.special_equipment))
+ special_equipment = target_item.special_equipment
+ hold_time_required = rand(hold_time_required[1], hold_time_required[2])
+ progression_reward += hold_time_required * (1 MINUTES)
+ telecrystal_reward += round(hold_time_required / max(minutes_per_telecrystal, 0.1))
+ replace_in_name("%ITEM%", target_item.name)
+ replace_in_name("%TIME%", hold_time_required)
+ return TRUE
+
+/datum/traitor_objective/steal_item/ungenerate_objective()
+ STOP_PROCESSING(SSprocessing, src)
+ if(bug)
+ UnregisterSignal(bug, list(COMSIG_TRAITOR_BUG_PLANTED_OBJECT, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT))
+ bug = null
+
+/datum/traitor_objective/steal_item/is_duplicate(datum/traitor_objective/steal_item/objective_to_compare)
+ if(objective_to_compare.target_item.type == target_item.type)
+ return TRUE
+ return FALSE
+
+/datum/traitor_objective/steal_item/generate_ui_buttons(mob/user)
+ var/list/buttons = list()
+ if(special_equipment)
+ buttons += add_ui_button("", "Pressing this will summon any extra special equipment you may need for the mission.", "tools", "summon_gear")
+ if(!bug)
+ buttons += add_ui_button("", "Pressing this will materialize a bug in your hand, which you can place on the target item", "wifi", "summon_bug")
+ else if(bug.planted_on)
+ buttons += add_ui_button("[DisplayTimeText(time_fulfilled)]", "This tells you how much time you have spent around the target item after the bug has been planted.", "clock", "none")
+ return buttons
+
+/datum/traitor_objective/steal_item/ui_perform_action(mob/living/user, action)
+ . = ..()
+ switch(action)
+ if("summon_bug")
+ if(bug)
+ return
+ bug = new(user.drop_location())
+ user.put_in_hands(bug)
+ bug.balloon_alert(user, "the bug materializes in your hand")
+ bug.target_object_type = target_item.targetitem
+ AddComponent(/datum/component/traitor_objective_register, bug, \
+ fail_signals = COMSIG_PARENT_QDELETING, \
+ penalty = telecrystal_penalty)
+ RegisterSignal(bug, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, .proc/on_bug_planted)
+ RegisterSignal(bug, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT, .proc/handle_special_case)
+ if("summon_gear")
+ if(!special_equipment)
+ return
+ for(var/item in special_equipment)
+ var/obj/item/new_item = new item(user.drop_location())
+ user.put_in_hands(new_item)
+ user.balloon_alert(user, "the equipment materializes in your hand")
+ special_equipment = null
+
+/datum/traitor_objective/steal_item/process(delta_time)
+ var/mob/owner = handler.owner?.current
+ if(objective_state != OBJECTIVE_STATE_ACTIVE || !bug.planted_on)
+ return PROCESS_KILL
+ if(!owner)
+ fail_objective()
+ return PROCESS_KILL
+ if(get_dist(get_turf(owner), get_turf(bug)) > max_distance)
+ return
+ time_fulfilled += delta_time * (1 SECONDS)
+ if(time_fulfilled >= hold_time_required * (1 MINUTES))
+ succeed_objective()
+ return PROCESS_KILL
+ handler.on_update()
+
+/datum/traitor_objective/steal_item/proc/handle_special_case(obj/item/source, obj/item/target)
+ SIGNAL_HANDLER
+ if(istype(target, target_item.targetitem))
+ if(!target_item.check_special_completion(target))
+ return COMPONENT_FORCE_FAIL_PLACEMENT
+ return
+
+ var/found = FALSE
+ for(var/typepath in target_item.valid_containers)
+ if(istype(target, typepath))
+ found = TRUE
+ break
+
+ if(!found)
+ return
+
+ var/found_item = locate(target_item.targetitem) in target
+ if(!found_item || !target_item.check_special_completion(found_item))
+ return COMPONENT_FORCE_FAIL_PLACEMENT
+ return COMPONENT_FORCE_PLACEMENT
+
+/datum/traitor_objective/steal_item/proc/on_bug_planted(obj/item/source, obj/item/location)
+ SIGNAL_HANDLER
+ START_PROCESSING(SSprocessing, src)
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
deleted file mode 100644
index dfbb7aaffd2..00000000000
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ /dev/null
@@ -1,236 +0,0 @@
-/datum/syndicate_contract
- var/id = 0
- var/status = CONTRACT_STATUS_INACTIVE
- var/datum/objective/contract/contract = new()
- var/target_rank
- var/ransom = 0
- var/payout_type
- var/wanted_message
-
- var/list/victim_belongings = list()
-
-/datum/syndicate_contract/New(contract_owner, blacklist, type=CONTRACT_PAYOUT_SMALL)
- contract.owner = contract_owner
- payout_type = type
-
- generate(blacklist)
-
-/datum/syndicate_contract/proc/generate(blacklist)
- contract.find_target(null, blacklist)
-
- var/datum/data/record/record
- if (contract.target)
- record = find_record("name", contract.target.name, GLOB.data_core.general)
-
- if (record)
- target_rank = record.fields["rank"]
- else
- target_rank = "Unknown"
-
- if (payout_type == CONTRACT_PAYOUT_LARGE)
- contract.payout_bonus = rand(9,13)
- else if (payout_type == CONTRACT_PAYOUT_MEDIUM)
- contract.payout_bonus = rand(6,8)
- else
- contract.payout_bonus = rand(2,4)
-
- contract.payout = rand(0, 2)
- contract.generate_dropoff()
-
- ransom = 100 * rand(18, 45)
-
- var/base = pick_list(WANTED_FILE, "basemessage")
- var/verb_string = pick_list(WANTED_FILE, "verb")
- var/noun = pick_list_weighted(WANTED_FILE, "noun")
- var/location = pick_list_weighted(WANTED_FILE, "location")
- wanted_message = "[base] [verb_string] [noun] [location]."
-
-/datum/syndicate_contract/proc/handle_extraction(mob/living/user)
- if (contract.target && contract.dropoff_check(user, contract.target.current))
-
- var/turf/free_location = find_obstruction_free_location(3, user, contract.dropoff)
-
- if (free_location)
- // We've got a valid location, launch.
- launch_extraction_pod(free_location)
- return TRUE
-
- return FALSE
-
-// Launch the pod to collect our victim.
-/datum/syndicate_contract/proc/launch_extraction_pod(turf/empty_pod_turf)
- var/obj/structure/closet/supplypod/extractionpod/empty_pod = new()
-
- RegisterSignal(empty_pod, COMSIG_ATOM_ENTERED, .proc/enter_check)
-
- empty_pod.stay_after_drop = TRUE
- empty_pod.reversing = TRUE
- empty_pod.explosionSize = list(0,0,0,1)
- empty_pod.leavingSound = 'sound/effects/podwoosh.ogg'
-
- new /obj/effect/pod_landingzone(empty_pod_turf, empty_pod)
-
-/datum/syndicate_contract/proc/enter_check(datum/source, sent_mob)
- SIGNAL_HANDLER
- if (istype(source, /obj/structure/closet/supplypod/extractionpod))
- if (isliving(sent_mob))
- var/mob/living/M = sent_mob
- var/datum/antagonist/traitor/traitor_data = contract.owner.has_antag_datum(/datum/antagonist/traitor)
-
- if (M == contract.target.current)
- traitor_data.contractor_hub.contract_TC_to_redeem += contract.payout
- traitor_data.contractor_hub.contracts_completed += 1
-
- if (M.stat != DEAD)
- traitor_data.contractor_hub.contract_TC_to_redeem += contract.payout_bonus
-
- status = CONTRACT_STATUS_COMPLETE
-
- if (traitor_data.contractor_hub.current_contract == src)
- traitor_data.contractor_hub.current_contract = null
-
- traitor_data.contractor_hub.contract_rep += 2
- else
- status = CONTRACT_STATUS_ABORTED // Sending a target that wasn't even yours is as good as just aborting it
-
- if (traitor_data.contractor_hub.current_contract == src)
- traitor_data.contractor_hub.current_contract = null
-
- if (iscarbon(M))
- for(var/obj/item/W in M)
- if (ishuman(M))
- var/mob/living/carbon/human/H = M
- if(W == H.w_uniform)
- continue //So all they're left with are shoes and uniform.
- if(W == H.shoes)
- continue
-
-
- M.transferItemToLoc(W)
- victim_belongings.Add(W)
-
- var/obj/structure/closet/supplypod/extractionpod/pod = source
-
- // Handle the pod returning
- pod.startExitSequence(pod)
-
- if (ishuman(M))
- var/mob/living/carbon/human/target = M
-
- // After we remove items, at least give them what they need to live.
- target.dna.species.give_important_for_life(target)
-
- // After pod is sent we start the victim narrative/heal.
- INVOKE_ASYNC(src, .proc/handleVictimExperience, M)
-
- // This is slightly delayed because of the sleep calls above to handle the narrative.
- // We don't want to tell the station instantly.
- var/points_to_check
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- points_to_check = D.account_balance
- if(points_to_check >= ransom)
- D.adjust_money(-ransom)
- else
- D.adjust_money(-points_to_check)
-
- priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. \
- As is policy we've taken a portion of the station's funds to offset the overall cost.", null, null, null, "Nanotrasen Asset Protection")
-
- INVOKE_ASYNC(src, .proc/finish_enter)
-
-/datum/syndicate_contract/proc/finish_enter()
- sleep(30)
-
- // Pay contractor their portion of ransom
- if (status == CONTRACT_STATUS_COMPLETE)
- var/obj/item/card/id/C = contract.owner.current?.get_idcard(TRUE)
-
- if(C?.registered_account)
- C.registered_account.adjust_money(ransom * 0.35)
-
- C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \
- [C.registered_account.account_balance] cr.", TRUE)
-
-// They're off to holding - handle the return timer and give some text about what's going on.
-/datum/syndicate_contract/proc/handleVictimExperience(mob/living/M)
- // Ship 'em back - dead or alive, 4 minutes wait.
- // Even if they weren't the target, we're still treating them the same.
- addtimer(CALLBACK(src, .proc/returnVictim, M), (60 * 10) * 4)
-
- if (M.stat != DEAD)
- // Heal them up - gets them out of crit/soft crit. If omnizine is removed in the future, this needs to be replaced with a
- // method of healing them, consequence free, to a reasonable amount of health.
- M.reagents.add_reagent(/datum/reagent/medicine/omnizine, 20)
-
- M.flash_act()
- M.add_confusion(10)
- M.blur_eyes(5)
- to_chat(M, span_warning("You feel strange..."))
- sleep(60)
- to_chat(M, span_warning("That pod did something to you..."))
- M.Dizzy(35)
- sleep(65)
- to_chat(M, span_warning("Your head pounds... It feels like it's going to burst out your skull!"))
- M.flash_act()
- M.add_confusion(20)
- M.blur_eyes(3)
- sleep(30)
- to_chat(M, span_warning("Your head pounds..."))
- sleep(100)
- M.flash_act()
- M.Unconscious(200)
- to_chat(M, "A million voices echo in your head... \"Your mind held many valuable secrets - \
- we thank you for providing them. Your value is expended, and you will be ransomed back to your station. We always get paid, \
- so it's only a matter of time before we ship you back...\"")
- M.blur_eyes(10)
- M.Dizzy(15)
- M.add_confusion(20)
-
-// We're returning the victim
-/datum/syndicate_contract/proc/returnVictim(mob/living/M)
- var/list/possible_drop_loc = list()
-
- for (var/turf/possible_drop in contract.dropoff.contents)
- if (!isspaceturf(possible_drop) && !isclosedturf(possible_drop))
- if (!possible_drop.is_blocked_turf())
- possible_drop_loc.Add(possible_drop)
-
- if (possible_drop_loc.len > 0)
- var/pod_rand_loc = rand(1, possible_drop_loc.len)
-
- var/obj/structure/closet/supplypod/return_pod = new()
- return_pod.bluespace = TRUE
- return_pod.explosionSize = list(0,0,0,0)
- return_pod.style = STYLE_SYNDICATE
-
- do_sparks(8, FALSE, M)
- M.visible_message(span_notice("[M] vanishes..."))
-
- for(var/obj/item/W in M)
- if (ishuman(M))
- var/mob/living/carbon/human/H = M
- if(W == H.w_uniform)
- continue //So all they're left with are shoes and uniform.
- if(W == H.shoes)
- continue
- M.dropItemToGround(W)
-
- for(var/obj/item/W in victim_belongings)
- W.forceMove(return_pod)
-
- M.forceMove(return_pod)
-
- M.flash_act()
- M.blur_eyes(30)
- M.Dizzy(35)
- M.add_confusion(20)
-
- new /obj/effect/pod_landingzone(possible_drop_loc[pod_rand_loc], return_pod)
- else
- to_chat(M, "A million voices echo in your head... \"Seems where you got sent here from won't \
- be able to handle our pod... You will die here instead.\"")
- if (iscarbon(M))
- var/mob/living/carbon/C = M
- if (C.can_heartattack())
- C.set_heartattack(TRUE)
diff --git a/code/modules/antagonists/traitor/traitor_objective.dm b/code/modules/antagonists/traitor/traitor_objective.dm
new file mode 100644
index 00000000000..3aa94a107f7
--- /dev/null
+++ b/code/modules/antagonists/traitor/traitor_objective.dm
@@ -0,0 +1,221 @@
+/// A traitor objective. Traitor objectives should not be deleted after they have been created and established, only failed.
+/// If a traitor objective needs to be removed from the failed/completed objective list of their handler, then you are doing something wrong
+/// and you should reconsider. When an objective is failed/completed, that is final and the only way you can change that is by refactoring the code.
+/datum/traitor_objective
+ /// The name of the traitor objective
+ var/name = "traitor objective"
+ /// The description of the traitor objective
+ var/description = "this is a traitor objective"
+ /// The uplink handler holder to give the progression and telecrystals to.
+ var/datum/uplink_handler/handler
+ /// The minimum required progression points for this objective
+ var/progression_minimum = 0 MINUTES
+ /// The maximum progression before this objective cannot appear anymore
+ var/progression_maximum = INFINITY
+ /// The progression that is rewarded from completing this traitor objective. Can either be a list of list(min, max) or a direct value
+ var/progression_reward = 0 MINUTES
+ /// The telecrystals that are rewarded from completing this traitor objective. Can either be a list of list(min,max) or a direct value
+ var/telecrystal_reward = 0
+ /// TC penalty for failing an objective or cancelling it
+ var/telecrystal_penalty = 1
+ /// The time at which this objective was completed
+ var/time_of_completion = 0
+ /// The current state of this objective
+ var/objective_state = OBJECTIVE_STATE_INACTIVE
+ /// Whether this objective was forced upon by an admin. Won't get autocleared by the traitor subsystem if progression surpasses an amount
+ var/forced = FALSE
+
+ /// Determines how influential global progression will affect this objective. Set to 0 to disable.
+ var/global_progression_influence_intensity = 0.5
+ /// Determines how great the deviance has to be before progression starts to get reduced.
+ var/global_progression_deviance_required = 0.5
+ /// Determines the minimum and maximum progression this objective can be worth as a result of being influenced by global progression
+ /// Should only be smaller than or equal to 1
+ var/global_progression_limit_coeff = 0.1
+ /// The deviance coefficient used to determine the randomness of the progression rewards.
+ var/progression_cost_coeff_deviance = 0.05
+ /// This gets added onto the coeff when calculating the updated progression cost. Used for variability and a slight bit of randomness
+ var/progression_cost_coeff = 0
+ /// The percentage that this objective has been increased or decreased by as a result of progression. Used by the UI
+ var/original_progression = 0
+ /// Abstract type that won't be included as a possible objective
+ var/abstract_type = /datum/traitor_objective
+
+/// Returns a list of variables that can be changed by config, allows for balance through configuration.
+/// It is not recommended to finetweak any values of objectives on your server.
+/datum/traitor_objective/proc/supported_configuration_changes()
+ return list(
+ NAMEOF(src, global_progression_influence_intensity),
+ NAMEOF(src, global_progression_deviance_required),
+ NAMEOF(src, global_progression_limit_coeff)
+ )
+
+/// Replaces a word in the name of the proc. Also does it for the description
+/datum/traitor_objective/proc/replace_in_name(replace, word)
+ name = replacetext(name, replace, word)
+ description = replacetext(description, replace, word)
+
+/datum/traitor_objective/New(datum/uplink_handler/handler)
+ . = ..()
+ src.handler = handler
+ apply_configuration()
+ if(SStraitor.generate_objectives)
+ if(islist(telecrystal_reward))
+ telecrystal_reward = rand(telecrystal_reward[1], telecrystal_reward[2])
+ if(islist(progression_reward))
+ progression_reward = rand(progression_reward[1], progression_reward[2])
+ else
+ if(!islist(telecrystal_reward))
+ telecrystal_reward = list(telecrystal_reward, telecrystal_reward)
+ if(!islist(progression_reward))
+ progression_reward = list(progression_reward, progression_reward)
+ progression_cost_coeff = (rand()*2 - 1) * progression_cost_coeff_deviance
+
+/datum/traitor_objective/proc/apply_configuration()
+ if(!length(SStraitor.configuration_data))
+ return
+ var/datum/traitor_objective/current_type = type
+ var/list/types = list()
+ while(current_type != /datum/traitor_objective)
+ types += current_type
+ current_type = type2parent(current_type)
+ types += /datum/traitor_objective
+ // Reverse the list direction
+ reverse_range(types)
+ var/list/supported_configurations = supported_configuration_changes()
+ for(var/typepath in types)
+ if(!(typepath in SStraitor.configuration_data))
+ continue
+ var/list/changes = SStraitor.configuration_data[typepath]
+ for(var/variable in changes)
+ if(!(variable in supported_configurations))
+ continue
+ vars[variable] = changes[variable]
+
+
+/// Updates the progression reward, scaling it depending on their current progression compared against the global progression
+/datum/traitor_objective/proc/update_progression_reward()
+ if(!SStraitor.generate_objectives)
+ return
+ progression_reward = original_progression
+ if(global_progression_influence_intensity <= 0)
+ return
+ var/minimum_progression = progression_reward * global_progression_limit_coeff
+ var/maximum_progression = global_progression_limit_coeff != 0? progression_reward / global_progression_limit_coeff : INFINITY
+ var/deviance = (SStraitor.current_global_progression - handler.progression_points) / SStraitor.progression_scaling_deviance
+ if(abs(deviance) < global_progression_deviance_required)
+ return
+ if(abs(deviance) == deviance) // If it is positive
+ deviance = deviance - global_progression_deviance_required
+ else
+ deviance = deviance + global_progression_deviance_required
+ var/coeff = NUM_E ** (global_progression_influence_intensity * deviance) - 1
+ // This has less of an effect as the coeff gets nearer to 1. Is linear
+ coeff += progression_cost_coeff * (1 - coeff)
+
+ progression_reward = clamp(
+ progression_reward + progression_reward * coeff,
+ minimum_progression,
+ maximum_progression
+ )
+
+/datum/traitor_objective/Destroy(force, ...)
+ handler = null
+ return ..()
+
+/// Called when the objective should be generated. Should return if the objective has been successfully generated.
+/// If false is returned, the objective will be removed as a potential objective for the traitor it is being generated for.
+/// This is only temporary, it will run the proc again when objectives are generated for the traitor again.
+/datum/traitor_objective/proc/generate_objective(datum/mind/generating_for, list/possible_duplicates)
+ return FALSE
+
+/// Used to clean up signals and stop listening to states.
+/datum/traitor_objective/proc/ungenerate_objective()
+ return
+
+/// Used to handle cleaning up the objective.
+/datum/traitor_objective/proc/handle_cleanup()
+ time_of_completion = world.time
+ ungenerate_objective()
+ if(objective_state == OBJECTIVE_STATE_INACTIVE)
+ handler.complete_objective(src) // Remove this objective immediately, no reason to keep it around. It isn't even active
+
+/// Used to fail objectives. Players can clear completed objectives in the UI
+/datum/traitor_objective/proc/fail_objective(penalty_cost = FALSE, trigger_update = TRUE)
+ // Don't let players succeed already succeeded/failed objectives
+ if(objective_state != OBJECTIVE_STATE_INACTIVE && objective_state != OBJECTIVE_STATE_ACTIVE)
+ return
+ SEND_SIGNAL(src, COMSIG_TRAITOR_OBJECTIVE_FAILED)
+ handle_cleanup()
+ if(penalty_cost)
+ handler.telecrystals -= penalty_cost
+ objective_state = OBJECTIVE_STATE_FAILED
+ else
+ objective_state = OBJECTIVE_STATE_INVALID
+ if(trigger_update)
+ handler.on_update() // Trigger an update to the UI
+
+/// Used to succeed objectives. Allows the player to cash it out in the UI.
+/datum/traitor_objective/proc/succeed_objective()
+ // Don't let players succeed already succeeded/failed objectives
+ if(objective_state != OBJECTIVE_STATE_INACTIVE && objective_state != OBJECTIVE_STATE_ACTIVE)
+ return
+ SEND_SIGNAL(src, COMSIG_TRAITOR_OBJECTIVE_COMPLETED)
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, src)
+ handle_cleanup()
+ objective_state = OBJECTIVE_STATE_COMPLETED
+ handler.on_update() // Trigger an update to the UI
+
+/// Called by player input, do not call directly. Validates whether the objective is finished and pays out the handler if it is.
+/datum/traitor_objective/proc/finish_objective(mob/user)
+ switch(objective_state)
+ if(OBJECTIVE_STATE_FAILED, OBJECTIVE_STATE_INVALID)
+ user.playsound_local(get_turf(user), 'sound/traitor/objective_failed.ogg', vol = 100, vary = FALSE, channel = CHANNEL_TRAITOR)
+ return TRUE
+ if(OBJECTIVE_STATE_COMPLETED)
+ user.playsound_local(get_turf(user), 'sound/traitor/objective_success.ogg', vol = 100, vary = FALSE, channel = CHANNEL_TRAITOR)
+ completion_payout()
+ return TRUE
+ return FALSE
+
+/// Called when rewards should be given to the user.
+/datum/traitor_objective/proc/completion_payout()
+ handler.progression_points += progression_reward
+ handler.telecrystals += telecrystal_reward
+
+/// Determines whether this objective is a duplicate. objective_to_compare is always of the type it is being called on.
+/datum/traitor_objective/proc/is_duplicate(datum/traitor_objective/objective_to_compare)
+ return TRUE
+
+/// Used for sending data to the uplink UI
+/datum/traitor_objective/proc/uplink_ui_data(mob/user)
+ return list(
+ "name" = name,
+ "description" = description,
+ "progression_minimum" = progression_minimum,
+ "progression_reward" = progression_reward,
+ "telecrystal_reward" = telecrystal_reward,
+ "ui_buttons" = generate_ui_buttons(user),
+ "objective_state" = objective_state,
+ "original_progression" = original_progression,
+ "telecrystal_penalty" = telecrystal_penalty,
+ )
+
+/datum/traitor_objective/proc/on_objective_taken(mob/user)
+ SStraitor.on_objective_taken(src)
+
+/// Used for generating the UI buttons for the UI. Use ui_perform_action to respond to clicks.
+/datum/traitor_objective/proc/generate_ui_buttons(mob/user)
+ return
+
+/datum/traitor_objective/proc/add_ui_button(name, tooltip, icon, action)
+ return list(list(
+ "name" = name,
+ "tooltip" = tooltip,
+ "icon" = icon,
+ "action" = action,
+ ))
+
+/// Return TRUE to trigger a UI update
+/datum/traitor_objective/proc/ui_perform_action(mob/user, action)
+ return TRUE
diff --git a/code/modules/antagonists/traitor/uplink_handler.dm b/code/modules/antagonists/traitor/uplink_handler.dm
new file mode 100644
index 00000000000..01dbc69c458
--- /dev/null
+++ b/code/modules/antagonists/traitor/uplink_handler.dm
@@ -0,0 +1,205 @@
+/**
+ * Uplink Handler
+ *
+ * The uplink handler, used to handle a traitor's TC and experience points and the uplink UI.
+**/
+/datum/uplink_handler
+ /// The owner of this uplink handler.
+ var/datum/mind/owner
+ /// The amount of telecrystals contained in this traitor has
+ var/telecrystals = 0
+ /// The current uplink flag of this uplink
+ var/uplink_flag = NONE
+ /// This uplink has progression
+ var/has_progression = TRUE
+ /// The amount of experience points this traitor has
+ var/progression_points = 0
+ /// The purchase log of this uplink handler
+ var/datum/uplink_purchase_log/purchase_log
+ /// Associative array of uplink item = stock left
+ var/list/item_stock = list()
+ /// Extra stuff that can be purchased by an uplink, regardless of flag.
+ var/list/extra_purchasable = list()
+ /// Whether this uplink handler has objectives.
+ var/has_objectives = TRUE
+ /// Whether this uplink handler can TAKE objectives.
+ var/can_take_objectives = TRUE
+ /// The maximum number of objectives that can be taken
+ var/maximum_active_objectives = 2
+ /// The maximum number of potential objectives that can exist.
+ var/maximum_potential_objectives = 6
+ /// Current objectives taken
+ var/list/active_objectives = list()
+ /// Potential objectives that can be taken
+ var/list/potential_objectives = list()
+ /// Objectives that have been completed.
+ var/list/completed_objectives = list()
+ /// All objectives assigned by type to handle any duplicates
+ var/list/potential_duplicate_objectives = list()
+ /// The role that this uplink handler is associated to.
+ var/assigned_role
+ /// Whether this is in debug mode or not. If in debug mode, allows all purchases
+ var/debug_mode = FALSE
+
+/datum/uplink_handler/New()
+ . = ..()
+ maximum_potential_objectives = CONFIG_GET(number/maximum_potential_objectives)
+
+/// Called whenever an update occurs on this uplink handler. Used for UIs
+/datum/uplink_handler/proc/on_update()
+ SEND_SIGNAL(src, COMSIG_UPLINK_HANDLER_ON_UPDATE)
+ return
+
+/datum/uplink_handler/proc/can_purchase_item(mob/user, datum/uplink_item/to_purchase)
+ if(debug_mode)
+ return TRUE
+
+ if(!(to_purchase in extra_purchasable))
+ if(!(to_purchase.purchasable_from & uplink_flag))
+ return FALSE
+
+ if(length(to_purchase.restricted_roles) && !(assigned_role in to_purchase.restricted_roles))
+ return FALSE
+
+ var/stock = item_stock[to_purchase] || INFINITY
+ if(telecrystals < to_purchase.cost || stock <= 0 || (has_progression && progression_points < to_purchase.progression_minimum))
+ return FALSE
+
+ return TRUE
+
+/datum/uplink_handler/proc/purchase_item(mob/user, datum/uplink_item/to_purchase)
+ if(!can_purchase_item(user, to_purchase))
+ return
+
+ if(to_purchase.limited_stock != -1 && !(to_purchase.type in item_stock))
+ item_stock[to_purchase] = to_purchase.limited_stock
+
+ telecrystals -= to_purchase.cost
+ to_purchase.purchase(user, src)
+
+ if(to_purchase.type in item_stock)
+ item_stock[to_purchase] -= 1
+
+ SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(to_purchase.name)]", "[to_purchase.cost]"))
+ on_update()
+ return TRUE
+
+/// Generates objectives for this uplink handler
+/datum/uplink_handler/proc/generate_objectives()
+ var/potential_objectives_left = maximum_potential_objectives - (length(potential_objectives) + length(active_objectives))
+ var/list/objectives = SStraitor.category_handler.get_possible_objectives(progression_points)
+ if(!length(objectives))
+ return
+ while(length(objectives) && potential_objectives_left > 0)
+ var/objective_typepath = pick_weight(objectives)
+ var/list/target_list = objectives
+ while(islist(objective_typepath))
+ if(!length(objective_typepath))
+ // Need to wrap this in a list or else it list unrolls and the list doesn't actually get removed.
+ // Thank you byond, very cool!
+ target_list -= list(objective_typepath)
+ break
+ target_list = objective_typepath
+ objective_typepath = pick_weight(objective_typepath)
+ if(islist(objective_typepath) || !objective_typepath)
+ continue
+ if(!try_add_objective(objective_typepath))
+ target_list -= objective_typepath
+ continue
+ potential_objectives_left--
+ on_update()
+
+/datum/uplink_handler/proc/try_add_objective(datum/traitor_objective/objective_typepath)
+ var/datum/traitor_objective/objective = new objective_typepath(src)
+ var/should_abort = SEND_SIGNAL(objective, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE, owner, potential_duplicate_objectives[objective_typepath]) & COMPONENT_TRAITOR_OBJECTIVE_ABORT_GENERATION
+ if(should_abort || !objective.generate_objective(owner, potential_duplicate_objectives[objective_typepath]))
+ qdel(objective)
+ return
+ if(!handle_duplicate(objective))
+ qdel(objective)
+ return
+ objective.original_progression = objective.progression_reward
+ objective.update_progression_reward()
+ potential_objectives += objective
+ return objective
+
+/datum/uplink_handler/proc/handle_duplicate(datum/traitor_objective/potential_duplicate)
+ if(!istype(potential_duplicate))
+ return FALSE
+
+ var/datum/traitor_objective/current_type = potential_duplicate.type
+ var/list/added_types = list()
+ while(current_type != /datum/traitor_objective)
+ if(!potential_duplicate_objectives[current_type])
+ potential_duplicate_objectives[current_type] = list(potential_duplicate)
+ else
+ for(var/datum/traitor_objective/duplicate_checker as anything in potential_duplicate_objectives[current_type])
+ if(duplicate_checker.is_duplicate(potential_duplicate))
+ for(var/typepath in added_types)
+ potential_duplicate_objectives[typepath] -= potential_duplicate
+ return FALSE
+ potential_duplicate_objectives[current_type] += potential_duplicate
+
+ added_types += current_type
+ current_type = type2parent(current_type)
+ return TRUE
+
+/datum/uplink_handler/proc/get_completion_count(datum/traitor_objective/type)
+ var/amount_completed = 0
+ for(var/datum/traitor_objective/objective as anything in potential_duplicate_objectives[type])
+ if(objective.objective_state == OBJECTIVE_STATE_COMPLETED)
+ amount_completed += 1
+ return amount_completed
+
+/datum/uplink_handler/proc/get_completion_progression(datum/traitor_objective/type)
+ var/total_progression = 0
+ for(var/datum/traitor_objective/objective as anything in completed_objectives)
+ if(objective.objective_state == OBJECTIVE_STATE_COMPLETED)
+ total_progression += objective.progression_reward
+ return total_progression
+
+/// Used to complete objectives, failed or successful.
+/datum/uplink_handler/proc/complete_objective(datum/traitor_objective/to_remove)
+ if(to_remove in completed_objectives)
+ return
+
+ potential_objectives -= to_remove
+ active_objectives -= to_remove
+ completed_objectives += to_remove
+ update_objectives()
+ generate_objectives()
+
+/// Updates the objectives on the uplink and deletes
+/datum/uplink_handler/proc/update_objectives()
+ var/list/potential_objectives_copy = potential_objectives.Copy()
+ for(var/datum/traitor_objective/objective as anything in potential_objectives_copy)
+ if(progression_points > objective.progression_maximum && !objective.forced)
+ objective.fail_objective(trigger_update = FALSE)
+ continue
+ objective.update_progression_reward()
+
+/datum/uplink_handler/proc/abort_objective(datum/traitor_objective/to_abort)
+ if(istype(to_abort, /datum/traitor_objective/final))
+ return
+ if(to_abort.objective_state != OBJECTIVE_STATE_ACTIVE)
+ return
+ to_abort.fail_objective(penalty_cost = to_abort.telecrystal_penalty)
+
+/datum/uplink_handler/proc/take_objective(mob/user, datum/traitor_objective/to_take)
+ if(!(to_take in potential_objectives))
+ return
+
+ user.playsound_local(get_turf(user), 'sound/traitor/objective_taken.ogg', vol = 100, vary = FALSE, channel = CHANNEL_TRAITOR)
+ to_take.on_objective_taken(user)
+ to_take.objective_state = OBJECTIVE_STATE_ACTIVE
+ potential_objectives -= to_take
+ active_objectives += to_take
+ on_update()
+
+/datum/uplink_handler/proc/ui_objective_act(mob/user, datum/traitor_objective/to_act_on, action)
+ if(!(to_act_on in active_objectives))
+ return
+ if(to_act_on.objective_state != OBJECTIVE_STATE_ACTIVE)
+ return
+
+ to_act_on.ui_perform_action(user, action)
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index eac432b21da..ed89f08798e 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -538,3 +538,43 @@
blended_color = "#2eeb9a"
pre_asset.Blend(blended_color, ICON_MULTIPLY)
return pre_asset
+
+/// Sends information needed for uplinks
+/datum/asset/json/uplink
+ name = "uplink"
+
+/datum/asset/json/uplink/generate()
+ var/list/data = list()
+ var/list/categories = list()
+ var/list/items = list()
+ for(var/datum/uplink_category/category as anything in subtypesof(/datum/uplink_category))
+ categories += category
+ categories = sortTim(categories, .proc/cmp_uplink_category_desc)
+
+ var/list/new_categories = list()
+ for(var/datum/uplink_category/category as anything in categories)
+ new_categories += initial(category.name)
+ categories = new_categories
+
+ for(var/datum/uplink_item/item_path as anything in subtypesof(/datum/uplink_item))
+ var/datum/uplink_item/item = new item_path()
+ if(item.item) {
+ items += list(list(
+ "id" = item_path,
+ "name" = item.name,
+ "cost" = item.cost,
+ "desc" = item.desc,
+ "category" = item.category? initial(item.category.name) : null,
+ "purchasable_from" = item.purchasable_from,
+ "restricted" = item.restricted,
+ "limited_stock" = item.limited_stock,
+ "restricted_roles" = item.restricted_roles,
+ "progression_minimum" = item.progression_minimum,
+ ))
+ }
+ SStraitor.uplink_items += item
+ SStraitor.uplink_items_by_type[item_path] = item
+
+ data["items"] = items
+ data["categories"] = categories
+ return data
diff --git a/code/modules/cargo/exports/traitor.dm b/code/modules/cargo/exports/traitor.dm
new file mode 100644
index 00000000000..61128a3ef7d
--- /dev/null
+++ b/code/modules/cargo/exports/traitor.dm
@@ -0,0 +1,20 @@
+/datum/export/traitor/edagger
+ cost = CARGO_CRATE_VALUE * 5
+ unit_name = "low value contraband"
+ export_types = list(
+ /obj/item/pen/edagger/prototype
+ )
+
+/datum/export/traitor/syringegun
+ cost = CARGO_CRATE_VALUE * 10
+ unit_name = "high value contraband"
+ export_types = list(
+ /obj/item/gun/syringe/syndicate/prototype
+ )
+
+/datum/export/traitor/ritual_wine
+ cost = CARGO_CRATE_VALUE * 15
+ unit_name = "super high value contraband"
+ export_types = list(
+ /obj/item/reagent_containers/glass/bottle/ritual_wine
+ )
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 4a771f036e8..9e3e1d2caf1 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -2720,20 +2720,24 @@
crate_name = "syndicate gear crate"
crate_type = /obj/structure/closet/crate
var/crate_value = 30 ///Total TC worth of contained uplink items
+ var/uplink_flag = UPLINK_TRAITORS
///Generate assorted uplink items, taking into account the same surplus modifiers used for surplus crates
/datum/supply_pack/misc/syndicate/fill(obj/structure/closet/crate/C)
- var/list/uplink_items = get_uplink_items(UPLINK_TRAITORS)
+ var/list/uplink_items = list()
+ for(var/datum/uplink_item/item_path as anything in SStraitor.uplink_items_by_type)
+ var/datum/uplink_item/item = SStraitor.uplink_items_by_type[item_path]
+ if(item.purchasable_from & UPLINK_TRAITORS)
+ uplink_items += item
+
while(crate_value)
- var/category = pick(uplink_items)
- var/item = pick(uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
- if(!I.surplus || prob(100 - I.surplus))
+ var/datum/uplink_item/uplink_item = pick(uplink_items)
+ if(!uplink_item.surplus || prob(100 - uplink_item.surplus))
continue
- if(crate_value < I.cost)
+ if(crate_value < uplink_item.cost)
continue
- crate_value -= I.cost
- new I.item(C)
+ crate_value -= uplink_item.cost
+ new uplink_item.item(C)
//////////////////////////////////////////////////////////////////////////////
/////////////////////// General Vending Restocks /////////////////////////////
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index a5b61b293f1..f0a145fc426 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -38,7 +38,7 @@ Assistant
rpg_title = "Lout"
/datum/outfit/job/assistant
- name = "Assistant"
+ name = JOB_ASSISTANT
jobtype = /datum/job/assistant
id_trim = /datum/id_trim/job/assistant
uniform = /obj/item/clothing/under/color/random
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index 44f966942d7..f3fbcd634fd 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -51,7 +51,7 @@
/datum/outfit/job/rd
- name = "Research Director"
+ name = JOB_RESEARCH_DIRECTOR
jobtype = /datum/job/research_director
id = /obj/item/card/id/advanced/silver
diff --git a/code/modules/jobs/job_types/spawner/battlecruiser.dm b/code/modules/jobs/job_types/spawner/battlecruiser.dm
new file mode 100644
index 00000000000..aaf571f8359
--- /dev/null
+++ b/code/modules/jobs/job_types/spawner/battlecruiser.dm
@@ -0,0 +1,7 @@
+/datum/job/battlecruiser_crew
+ title = ROLE_BATTLECRUISER_CREW
+ policy_index = ROLE_BATTLECRUISER_CREW
+
+/datum/job/battlecruiser_captain
+ title = ROLE_BATTLECRUISER_CAPTAIN
+ policy_index = ROLE_BATTLECRUISER_CAPTAIN
diff --git a/code/modules/mafia/roles.dm b/code/modules/mafia/roles.dm
index 487259c5d41..2fed9bd5160 100644
--- a/code/modules/mafia/roles.dm
+++ b/code/modules/mafia/roles.dm
@@ -1,5 +1,5 @@
/datum/mafia_role
- var/name = "Assistant"
+ var/name = JOB_ASSISTANT
var/desc = "You are a crewmember without any special abilities."
var/win_condition = "kill all mafia and solo killing roles."
var/team = MAFIA_TEAM_TOWN
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 621c1a8e54f..e9679ad3482 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -44,6 +44,7 @@
var/list/obj/machinery/atmospherics/atmos_machines = list()
var/list/obj/structure/cable/cables = list()
var/list/atom/movable/movables = list()
+ var/list/obj/docking_port/stationary/ports = list()
var/list/area/areas = list()
var/list/turfs = block(
@@ -71,6 +72,8 @@
continue
if(istype(movable_in_turf, /obj/machinery/atmospherics))
atmos_machines += movable_in_turf
+ if(istype(movable_in_turf, /obj/docking_port/stationary))
+ ports += movable_in_turf
// Not sure if there is some importance here to make sure the area is in z
// first or not. Its defined In Initialize yet its run first in templates
@@ -94,6 +97,7 @@
// need these two below?
SSmachines.setup_template_powernets(cables)
SSair.setup_template_machinery(atmos_machines)
+ SSshuttle.setup_shuttles(ports)
//calculate all turfs inside the border
var/list/template_and_bordering_turfs = block(
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 21cf118b4b1..09b64b7d926 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -141,6 +141,8 @@
/mob/living/simple_animal/pet/dog/pug/mcgriff
name = "McGriff"
desc = "This dog can tell something smells around here, and that something is CRIME!"
+ gold_core_spawnable = NO_SPAWN
+ unique_pet = TRUE
/mob/living/simple_animal/pet/dog/bullterrier
name = "\improper bull terrier"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 9e8613161b1..f9cf1854517 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -35,7 +35,7 @@
/mob/living/simple_animal/drone/syndrone/Initialize(mapload)
. = ..()
var/datum/component/uplink/hidden_uplink = internal_storage.GetComponent(/datum/component/uplink)
- hidden_uplink.telecrystals = 10
+ hidden_uplink.set_telecrystals(10)
/mob/living/simple_animal/drone/syndrone/badass
name = "Badass Syndrone"
@@ -44,7 +44,7 @@
/mob/living/simple_animal/drone/syndrone/badass/Initialize(mapload)
. = ..()
var/datum/component/uplink/hidden_uplink = internal_storage.GetComponent(/datum/component/uplink)
- hidden_uplink.telecrystals = 30
+ hidden_uplink.set_telecrystals(30)
var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(src)
W.implant(src, force = TRUE)
diff --git a/code/modules/mob_spawn/corpses/job_corpses.dm b/code/modules/mob_spawn/corpses/job_corpses.dm
index 7294f85a569..a261aa09519 100644
--- a/code/modules/mob_spawn/corpses/job_corpses.dm
+++ b/code/modules/mob_spawn/corpses/job_corpses.dm
@@ -55,7 +55,7 @@
outfit = /datum/outfit/plasmaman
/obj/effect/mob_spawn/corpse/human/assistant
- name = "Assistant"
+ name = JOB_ASSISTANT
outfit = /datum/outfit/job/assistant
icon_state = "corpsegreytider"
diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm
index 9748a480849..43164d7d677 100644
--- a/code/modules/mob_spawn/ghost_roles/space_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm
@@ -92,3 +92,131 @@
if(prob(90)) //only has a 10% chance of existing, otherwise it'll just be a NPC syndie.
new /mob/living/simple_animal/hostile/syndicate/ranged(get_turf(src))
return INITIALIZE_HINT_QDEL
+
+///battlecruiser stuff
+
+/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser
+ name = "Syndicate Battlecruiser Ship Operative"
+ you_are_text = "You are a crewmember aboard the syndicate flagship: the SBC Starfury."
+ flavour_text = "Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it."
+ important_text = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
+ prompt_name = "a battlecruiser crewmember"
+ outfit = /datum/outfit/syndicate_empty/battlecruiser
+ spawner_job_path = /datum/job/battlecruiser_crew
+
+ /// The antag team to apply the player to
+ var/datum/team/antag_team
+ /// The antag datum to give to the player spawned
+ var/antag_datum_to_give = /datum/antagonist/battlecruiser
+
+/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/special(mob/living/spawned_mob, mob/possesser)
+ . = ..()
+ if(!spawned_mob.mind)
+ spawned_mob.mind_initialize()
+ var/datum/mind/mob_mind = spawned_mob.mind
+ mob_mind.add_antag_datum(antag_datum_to_give, antag_team)
+
+/datum/team/battlecruiser
+ name = "Battlecruiser Crew"
+ member_name = "crewmember"
+ /// The central objective of this battlecruiser
+ var/core_objective = /datum/objective/nuclear
+ /// The assigned nuke of this team
+ var/obj/machinery/nuclearbomb/nuke
+
+/datum/team/battlecruiser/proc/update_objectives()
+ if(core_objective)
+ var/datum/objective/objective = new core_objective()
+ objective.team = src
+ objectives += objective
+
+/datum/antagonist/battlecruiser
+ name = "Battlecruiser Crewmember"
+ show_to_ghosts = TRUE
+ roundend_category = "battlecruiser syndicate operatives"
+ suicide_cry = "FOR THE SYNDICATE!!!"
+ antag_hud_name = "battlecruiser_crew"
+ job_rank = ROLE_BATTLECRUISER_CREW
+ var/datum/team/battlecruiser/battlecruiser_team
+
+/datum/antagonist/battlecruiser/get_team()
+ return battlecruiser_team
+
+/datum/antagonist/battlecruiser/greet()
+ owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE)
+ to_chat(owner, span_big("You are a [name]!"))
+ owner.announce_objectives()
+
+/datum/antagonist/battlecruiser/captain
+ name = "Battlecruiser Captain"
+ antag_hud_name = "battlecruiser_lead"
+ job_rank = ROLE_BATTLECRUISER_CAPTAIN
+
+/datum/antagonist/battlecruiser/create_team(datum/team/battlecruiser/team)
+ if(!team)
+ return
+ if(!istype(team))
+ stack_trace("Wrong team type passed to [type] initialization.")
+ battlecruiser_team = team
+
+/datum/antagonist/battlecruiser/apply_innate_effects(mob/living/mob_override)
+ add_team_hud(mob_override || owner.current, /datum/antagonist/battlecruiser)
+
+/datum/antagonist/battlecruiser/on_gain()
+ if(battlecruiser_team)
+ objectives |= battlecruiser_team.objectives
+ if(battlecruiser_team.nuke)
+ var/obj/machinery/nuclearbomb/nuke = battlecruiser_team.nuke
+ antag_memory += "[nuke] Code: [nuke.r_code] "
+ owner.add_memory(MEMORY_NUKECODE, list(DETAIL_NUKE_CODE = nuke.r_code, DETAIL_PROTAGONIST = owner.current), story_value = STORY_VALUE_AMAZING, memory_flags = MEMORY_FLAG_NOLOCATION | MEMORY_FLAG_NOMOOD | MEMORY_FLAG_NOPERSISTENCE)
+ to_chat(owner, "The nuclear authorization code is: [nuke.r_code]")
+ return ..()
+
+/datum/outfit/syndicate_empty/battlecruiser
+ name = "Syndicate Battlecruiser Ship Operative"
+ l_pocket = /obj/item/gun/ballistic/automatic/pistol
+ r_pocket = /obj/item/knife/combat/survival
+ belt = /obj/item/storage/belt/military/assault
+
+/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/assault
+ name = "Syndicate Battlecruiser Assault Operative"
+ you_are_text = "You are an assault operative aboard the syndicate flagship: the SBC Starfury."
+ flavour_text = "Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with."
+ important_text = "Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!"
+ prompt_name = "a battlecruiser operative"
+ outfit = /datum/outfit/syndicate_empty/battlecruiser/assault
+
+/datum/outfit/syndicate_empty/battlecruiser/assault
+ name = "Syndicate Battlecruiser Assault Operative"
+ uniform = /obj/item/clothing/under/syndicate/combat
+ l_pocket = /obj/item/uplink/nuclear
+ r_pocket = /obj/item/modular_computer/tablet/nukeops
+ belt = /obj/item/storage/belt/military
+ suit = /obj/item/clothing/suit/armor/vest
+ suit_store = /obj/item/gun/ballistic/automatic/pistol
+ back = /obj/item/storage/backpack/security
+ mask = /obj/item/clothing/mask/gas/syndicate
+
+/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain
+ name = "Syndicate Battlecruiser Captain"
+ you_are_text = "You are the captain aboard the syndicate flagship: the SBC Starfury."
+ flavour_text = "Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal."
+ important_text = "As the captain, this whole operation falls on your shoulders. Help your assault operatives detonate a nuke on the station."
+ prompt_name = "a battlecruiser captain"
+ outfit = /datum/outfit/syndicate_empty/battlecruiser/assault/captain
+ spawner_job_path = /datum/job/battlecruiser_captain
+ antag_datum_to_give = /datum/antagonist/battlecruiser/captain
+
+/datum/outfit/syndicate_empty/battlecruiser/assault/captain
+ name = "Syndicate Battlecruiser Captain"
+ l_pocket = /obj/item/melee/energy/sword/saber/red
+ r_pocket = /obj/item/melee/baton/telescopic
+ suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
+ suit_store = /obj/item/gun/ballistic/revolver/mateba
+ back = /obj/item/storage/backpack/satchel/leather
+ head = /obj/item/clothing/head/hos/syndicate
+ mask = /obj/item/clothing/mask/cigarette/cigar/havana
+ ears = /obj/item/radio/headset/syndicate/alt/leader
+ glasses = /obj/item/clothing/glasses/thermal/eyepatch
+ id = /obj/item/card/id/advanced/black/syndicate_command/captain_id
+ id_trim = /datum/id_trim/battlecruiser/captain
diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm
index 49c5a6339b6..932813fb3d6 100644
--- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm
@@ -100,61 +100,6 @@
new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
return ..()
-//battlecruiser stuff, i suppose
-
-/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser
- name = "Syndicate Battlecruiser Ship Operative"
- you_are_text = "You are a crewmember aboard the syndicate flagship: the SBC Starfury."
- flavour_text = "Your job is to follow your captain's orders, maintain the ship, and keep the engine running. If you are not familiar with how the supermatter engine functions: do not attempt to start it."
- important_text = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
- prompt_name = "a battlecruiser crewmember"
- outfit = /datum/outfit/syndicate_empty/battlecruiser
-
-/datum/outfit/syndicate_empty/battlecruiser
- name = "Syndicate Battlecruiser Ship Operative"
- l_pocket = /obj/item/gun/ballistic/automatic/pistol
- r_pocket = /obj/item/knife/combat/survival
- belt = /obj/item/storage/belt/military/assault
-
-/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/assault
- name = "Syndicate Battlecruiser Assault Operative"
- you_are_text = "You are an assault operative aboard the syndicate flagship: the SBC Starfury."
- flavour_text = "Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13. There is an armory, multiple assault ships, and beam cannons to attack the station with."
- important_text = "Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!"
- prompt_name = "a battlecruiser operative"
- outfit = /datum/outfit/syndicate_empty/battlecruiser/assault
-
-/datum/outfit/syndicate_empty/battlecruiser/assault
- name = "Syndicate Battlecruiser Assault Operative"
- uniform = /obj/item/clothing/under/syndicate/combat
- l_pocket = /obj/item/ammo_box/magazine/m9mm
- r_pocket = /obj/item/knife/combat/survival
- belt = /obj/item/storage/belt/military
- suit = /obj/item/clothing/suit/armor/vest
- suit_store = /obj/item/gun/ballistic/automatic/pistol
- back = /obj/item/storage/backpack/security
- mask = /obj/item/clothing/mask/gas/syndicate
-
-/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain
- name = "Syndicate Battlecruiser Captain"
- you_are_text = "You are the captain aboard the syndicate flagship: the SBC Starfury."
- flavour_text = "Your job is to oversee your crew, defend the ship, and destroy Space Station 13. The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal."
- important_text = "As the captain, this whole operation falls on your shoulders. You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough."
- prompt_name = "a battlecruiser captain"
- outfit = /datum/outfit/syndicate_empty/battlecruiser/assault/captain
-
-/datum/outfit/syndicate_empty/battlecruiser/assault/captain
- name = "Syndicate Battlecruiser Captain"
- l_pocket = /obj/item/melee/energy/sword/saber/red
- r_pocket = /obj/item/melee/baton/telescopic
- suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
- suit_store = /obj/item/gun/ballistic/revolver/mateba
- back = /obj/item/storage/backpack/satchel/leather
- head = /obj/item/clothing/head/hos/syndicate
- mask = /obj/item/clothing/mask/cigarette/cigar/havana
- glasses = /obj/item/clothing/glasses/thermal/eyepatch
- id_trim = /datum/id_trim/battlecruiser/captain
-
/obj/effect/mob_spawn/ghost_role/human/syndicate
name = "Syndicate Operative"
icon = 'icons/obj/machines/sleeper.dmi'
diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm
index 1190044ebaf..99b370e332a 100644
--- a/code/modules/modular_computers/computers/item/tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/tablet_presets.dm
@@ -85,25 +85,6 @@
hard_drive.store_file(new /datum/computer_file/program/alarm_monitor)
hard_drive.store_file(new /datum/computer_file/program/supermatter_monitor)
-/// Given by the syndicate as part of the contract uplink bundle - loads in the Contractor Uplink.
-/obj/item/modular_computer/tablet/syndicate_contract_uplink/preset/uplink/Initialize(mapload)
- . = ..()
- var/obj/item/computer_hardware/hard_drive/small/syndicate/hard_drive = new
- var/datum/computer_file/program/contract_uplink/uplink = new
-
- active_program = uplink
- uplink.program_state = PROGRAM_STATE_ACTIVE
- uplink.computer = src
-
- hard_drive.store_file(uplink)
-
- install_component(new /obj/item/computer_hardware/processor_unit/small)
- install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer))
- install_component(hard_drive)
- install_component(new /obj/item/computer_hardware/network_card)
- install_component(new /obj/item/computer_hardware/card_slot)
- install_component(new /obj/item/computer_hardware/printer/mini)
-
/// Given to Nuke Ops members.
/obj/item/modular_computer/tablet/nukeops/Initialize(mapload)
. = ..()
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm
deleted file mode 100644
index 1cad0e46f83..00000000000
--- a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm
+++ /dev/null
@@ -1,209 +0,0 @@
-/datum/computer_file/program/contract_uplink
- filename = "contractor uplink"
- filedesc = "Syndicate Contractor Uplink"
- category = PROGRAM_CATEGORY_MISC
- program_icon_state = "assign"
- extended_desc = "A standard, Syndicate issued system for handling important contracts while on the field."
- size = 10
- requires_ntnet = 0
- available_on_ntnet = 0
- unsendable = 1
- undeletable = 1
- tgui_id = "SyndContractor"
- program_icon = "tasks"
- var/error = ""
- var/info_screen = TRUE
- var/assigned = FALSE
- var/first_load = TRUE
-
-/datum/computer_file/program/contract_uplink/run_program(mob/living/user)
- . = ..(user)
-
-/datum/computer_file/program/contract_uplink/ui_act(action, params)
- . = ..()
- if(.)
- return
-
- var/mob/living/user = usr
- var/obj/item/computer_hardware/hard_drive/small/syndicate/hard_drive = computer.all_components[MC_HDD]
-
- switch(action)
- if("PRG_contract-accept")
- var/contract_id = text2num(params["contract_id"])
-
- // Set as the active contract
- hard_drive.traitor_data.contractor_hub.assigned_contracts[contract_id].status = CONTRACT_STATUS_ACTIVE
- hard_drive.traitor_data.contractor_hub.current_contract = hard_drive.traitor_data.contractor_hub.assigned_contracts[contract_id]
-
- program_icon_state = "single_contract"
- return TRUE
- if("PRG_login")
- var/datum/antagonist/traitor/traitor_data = user.mind.has_antag_datum(/datum/antagonist/traitor)
-
- // Bake their data right into the hard drive, or we don't allow non-antags gaining access to an unused
- // contract system.
- // We also create their contracts at this point.
- if (traitor_data)
- // Only play greet sound, and handle contractor hub when assigning for the first time.
- if (!traitor_data.contractor_hub)
- user.playsound_local(user, 'sound/effects/contractstartup.ogg', 100, FALSE)
- traitor_data.contractor_hub = new
- traitor_data.contractor_hub.create_hub_items()
-
- // Stops any topic exploits such as logging in multiple times on a single system.
- if (!assigned)
- traitor_data.contractor_hub.create_contracts(traitor_data.owner)
-
- hard_drive.traitor_data = traitor_data
-
- program_icon_state = "contracts"
- assigned = TRUE
- else
- error = "UNAUTHORIZED USER"
- return TRUE
- if("PRG_call_extraction")
- if (hard_drive.traitor_data.contractor_hub.current_contract.status != CONTRACT_STATUS_EXTRACTING)
- if (hard_drive.traitor_data.contractor_hub.current_contract.handle_extraction(user))
- user.playsound_local(user, 'sound/effects/confirmdropoff.ogg', 100, TRUE)
- hard_drive.traitor_data.contractor_hub.current_contract.status = CONTRACT_STATUS_EXTRACTING
-
- program_icon_state = "extracted"
- else
- user.playsound_local(user, 'sound/machines/uplinkerror.ogg', 50)
- error = "Either both you or your target aren't at the dropoff location, or the pod hasn't got a valid place to land. Clear space, or make sure you're both inside."
- else
- user.playsound_local(user, 'sound/machines/uplinkerror.ogg', 50)
- error = "Already extracting... Place the target into the pod. If the pod was destroyed, this contract is no longer possible."
-
- return TRUE
- if("PRG_contract_abort")
- var/contract_id = hard_drive.traitor_data.contractor_hub.current_contract.id
-
- hard_drive.traitor_data.contractor_hub.current_contract = null
- hard_drive.traitor_data.contractor_hub.assigned_contracts[contract_id].status = CONTRACT_STATUS_ABORTED
-
- program_icon_state = "contracts"
-
- return TRUE
- if("PRG_redeem_TC")
- if (hard_drive.traitor_data.contractor_hub.contract_TC_to_redeem)
- var/obj/item/stack/telecrystal/crystals = new /obj/item/stack/telecrystal(get_turf(user),
- hard_drive.traitor_data.contractor_hub.contract_TC_to_redeem)
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.put_in_hands(crystals))
- to_chat(H, span_notice("Your payment materializes into your hands!"))
- else
- to_chat(user, span_notice("Your payment materializes onto the floor."))
-
- hard_drive.traitor_data.contractor_hub.contract_TC_payed_out += hard_drive.traitor_data.contractor_hub.contract_TC_to_redeem
- hard_drive.traitor_data.contractor_hub.contract_TC_to_redeem = 0
- return TRUE
- else
- user.playsound_local(user, 'sound/machines/uplinkerror.ogg', 50)
- return TRUE
- if ("PRG_clear_error")
- error = ""
- return TRUE
- if("PRG_set_first_load_finished")
- first_load = FALSE
- return TRUE
- if("PRG_toggle_info")
- info_screen = !info_screen
- return TRUE
- if ("buy_hub")
- if (hard_drive.traitor_data.owner.current == user)
- var/item = params["item"]
-
- for (var/datum/contractor_item/hub_item in hard_drive.traitor_data.contractor_hub.hub_items)
- if (hub_item.name == item)
- hub_item.handle_purchase(hard_drive.traitor_data.contractor_hub, user)
- else
- error = "Invalid user... You weren't recognised as the user of this system."
-
-/datum/computer_file/program/contract_uplink/ui_data(mob/user)
- var/list/data = list()
- var/obj/item/computer_hardware/hard_drive/small/syndicate/hard_drive = computer.all_components[MC_HDD]
- var/screen_to_be = null
-
- data["first_load"] = first_load
-
- if (hard_drive && hard_drive.traitor_data != null)
- var/datum/antagonist/traitor/traitor_data = hard_drive.traitor_data
- data += get_header_data()
-
- if (traitor_data.contractor_hub.current_contract)
- data["ongoing_contract"] = TRUE
- screen_to_be = "single_contract"
- if (traitor_data.contractor_hub.current_contract.status == CONTRACT_STATUS_EXTRACTING)
- data["extraction_enroute"] = TRUE
- screen_to_be = "extracted"
- else
- data["extraction_enroute"] = FALSE
- else
- data["ongoing_contract"] = FALSE
- data["extraction_enroute"] = FALSE
-
- data["logged_in"] = TRUE
- data["station_name"] = GLOB.station_name
- data["redeemable_tc"] = traitor_data.contractor_hub.contract_TC_to_redeem
- data["earned_tc"] = traitor_data.contractor_hub.contract_TC_payed_out
- data["contracts_completed"] = traitor_data.contractor_hub.contracts_completed
- data["contract_rep"] = traitor_data.contractor_hub.contract_rep
-
- data["info_screen"] = info_screen
-
- data["error"] = error
-
- for (var/datum/contractor_item/hub_item in traitor_data.contractor_hub.hub_items)
- data["contractor_hub_items"] += list(list(
- "name" = hub_item.name,
- "desc" = hub_item.desc,
- "cost" = hub_item.cost,
- "limited" = hub_item.limited,
- "item_icon" = hub_item.item_icon
- ))
-
- for (var/datum/syndicate_contract/contract in traitor_data.contractor_hub.assigned_contracts)
- if(!contract.contract)
- stack_trace("Syndiate contract with null contract objective found in [traitor_data.owner]'s contractor hub!")
- contract.status = CONTRACT_STATUS_ABORTED
- continue
-
- data["contracts"] += list(list(
- "target" = contract.contract.target,
- "target_rank" = contract.target_rank,
- "payout" = contract.contract.payout,
- "payout_bonus" = contract.contract.payout_bonus,
- "dropoff" = contract.contract.dropoff,
- "id" = contract.id,
- "status" = contract.status,
- "message" = contract.wanted_message
- ))
-
- var/direction
- if (traitor_data.contractor_hub.current_contract)
- var/turf/curr = get_turf(user)
- var/turf/dropoff_turf
- data["current_location"] = "[get_area_name(curr, TRUE)]"
-
- for (var/turf/content in traitor_data.contractor_hub.current_contract.contract.dropoff.contents)
- if (isturf(content))
- dropoff_turf = content
- break
-
- if(curr.z == dropoff_turf.z) //Direction calculations for same z-level only
- direction = uppertext(dir2text(get_dir(curr, dropoff_turf))) //Direction text (East, etc). Not as precise, but still helpful.
- if(get_area(user) == traitor_data.contractor_hub.current_contract.contract.dropoff)
- direction = "LOCATION CONFIRMED"
- else
- direction = "???"
-
- data["dropoff_direction"] = direction
-
- else
- data["logged_in"] = FALSE
-
- program_icon_state = screen_to_be
- update_computer_icon()
- return data
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 65e4a422250..f7674f46dfd 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -225,6 +225,10 @@
sharpness = SHARP_POINTY
/// The real name of our item when extended.
var/hidden_name = "energy dagger"
+ /// The real desc of our item when extended.
+ var/hidden_desc = "It's a normal black ink pen."
+ /// The real icons used when extended.
+ var/hidden_icon = "edagger"
/// Whether or pen is extended
var/extended = FALSE
@@ -259,13 +263,15 @@
extended = active
if(active)
name = hidden_name
- icon_state = "edagger"
- inhand_icon_state = "edagger"
+ desc = hidden_desc
+ icon_state = hidden_icon
+ inhand_icon_state = hidden_icon
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
embedding = list(embed_chance = 100) // Rule of cool
else
name = initial(name)
+ desc = initial(desc)
icon_state = initial(icon_state)
inhand_icon_state = initial(inhand_icon_state)
lefthand_file = initial(lefthand_file)
@@ -277,6 +283,15 @@
playsound(user ? user : src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 5, TRUE)
return COMPONENT_NO_DEFAULT_MESSAGE
+///syndicate prototype for smuggling missions
+/obj/item/pen/edagger/prototype
+ name = "odd pen"
+ desc = "It's an abnormal black ink pen, with weird chunks of metal sticking out of it..."
+ hidden_name = "prototype hardlight dagger"
+ hidden_desc = "Waffle Corp R&D's prototype for energy daggers. Hardlight may be inferior \
+ to energy weapons, but it's still surprisingly deadly."
+ hidden_icon = "eprototypedagger"
+
/obj/item/pen/survival
name = "survival pen"
desc = "The latest in portable survival technology, this pen was designed as a miniature diamond pickaxe. Watchers find them very desirable for their diamond exterior."
diff --git a/code/modules/projectiles/guns/special/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm
index cf4768d092c..eb83d1c2a86 100644
--- a/code/modules/projectiles/guns/special/syringe_gun.dm
+++ b/code/modules/projectiles/guns/special/syringe_gun.dm
@@ -129,6 +129,13 @@
can_unsuppress = FALSE //Permanently silenced
syringes = list(new /obj/item/reagent_containers/syringe())
+///syndicate prototype for smuggling missions
+/obj/item/gun/syringe/syndicate/prototype
+ name = "prototype dart pistol"
+ desc = "Cybersun Industries prototype dart pistols. Delivering the syringes at the same \
+ speed in a smaller weapon proved to be a surprisingly complicated task."
+ syringes = list()
+
/obj/item/gun/syringe/dna
name = "modified compact syringe gun"
desc = "A syringe gun that has been modified to be compact and fit DNA injectors instead of normal syringes."
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index dfc87e56df4..09384afd539 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2725,6 +2725,29 @@ All effects don't start immediately, but rather get worse over time; the rate is
QDEL_NULL(prophet_trauma)
return ..()
+//a jacked up absinthe that causes hallucinations to the game master controller basically, used in smuggling objectives
+/datum/reagent/consumable/ethanol/ritual_wine
+ name = "Ritual Wine"
+ description = "The dangerous, potent, alcoholic component of ritual wine."
+ color = rgb(35, 231, 25)
+ boozepwr = 90 //enjoy near death intoxication
+ taste_mult = 6
+ taste_description = "concentrated herbs"
+
+/datum/reagent/consumable/ethanol/ritual_wine/on_mob_metabolize(mob/living/psychonaut)
+ . = ..()
+ if(!psychonaut.hud_used)
+ return
+ var/atom/movable/plane_master_controller/game_plane_master_controller = psychonaut.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ game_plane_master_controller.add_filter("ritual_wine", 1, list("type" = "wave", "size" = 1, "x" = 5, "y" = 0, "flags" = WAVE_SIDEWAYS))
+
+/datum/reagent/consumable/ethanol/ritual_wine/on_mob_end_metabolize(mob/living/psychonaut)
+ . = ..()
+ if(!psychonaut.hud_used)
+ return
+ var/atom/movable/plane_master_controller/game_plane_master_controller = psychonaut.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ game_plane_master_controller.remove_filter("ritual_wine")
+
//Moth Drinks
/datum/reagent/consumable/ethanol/curacao
name = "Curaçao"
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 677ee5018da..3e97e6df6ec 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -2084,11 +2084,11 @@
/datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way.
. = ..()
boost_item_paths = list()
- for(var/path in GLOB.uplink_items)
- var/datum/uplink_item/UI = new path
- if(!UI.item || !UI.illegal_tech)
+ for(var/datum/uplink_item/item_path as anything in SStraitor.uplink_items_by_type)
+ var/datum/uplink_item/item = SStraitor.uplink_items_by_type[item_path]
+ if(!item.item || !item.illegal_tech)
continue
- boost_item_paths |= UI.item //allows deconning to unlock.
+ boost_item_paths |= item.item //allows deconning to unlock.
////////////////////////B.E.P.I.S. Locked Techs////////////////////////
diff --git a/code/modules/shuttle/battlecruiser_starfury.dm b/code/modules/shuttle/battlecruiser_starfury.dm
new file mode 100644
index 00000000000..63f59736cf0
--- /dev/null
+++ b/code/modules/shuttle/battlecruiser_starfury.dm
@@ -0,0 +1,189 @@
+
+/// The Starfury map template itself.
+/datum/map_template/battlecruiser_starfury
+ name = "SBC Starfury"
+ mappath = "_maps/templates/battlecruiser_starfury.dmm"
+
+// Stationary docking ports for the Starfury's strike shuttles.
+/obj/docking_port/stationary/starfury_corvette
+ name = "SBC Starfury Corvette Bay"
+ id = "SBC_corvette_bay"
+ roundstart_template = /datum/map_template/shuttle/starfury/corvette
+ hidden = TRUE
+ width = 14
+ height = 7
+ dwidth = 7
+ dir = NORTH
+
+/obj/docking_port/stationary/starfury_fighter
+ name = "SBC Starfury Fighter Bay"
+ id = "SBC_fighter_bay"
+ hidden = TRUE
+ width = 5
+ height = 7
+ dwidth = 2
+ dir = NORTH
+
+/obj/docking_port/stationary/starfury_fighter/fighter_one
+ name = "SBC Starfury Port Fighter Bay"
+ id = "SBC_fighter1_bay"
+ roundstart_template = /datum/map_template/shuttle/starfury/fighter_one
+
+/obj/docking_port/stationary/starfury_fighter/fighter_two
+ name = "SBC Starfury Center Fighter Bay"
+ id = "SBC_fighter2_bay"
+ roundstart_template = /datum/map_template/shuttle/starfury/fighter_two
+
+/obj/docking_port/stationary/starfury_fighter/fighter_three
+ name = "SBC Starfury Starboard Fighter Bay"
+ id = "SBC_fighter3_bay"
+ roundstart_template = /datum/map_template/shuttle/starfury/fighter_three
+
+// Mobile docking ports for the Starfury's strike shuttles.
+/obj/docking_port/mobile/syndicate_fighter
+ name = "syndicate fighter"
+ id = "syndicate_fighter"
+ movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
+ hidden = TRUE
+ dir = NORTH
+ port_direction = SOUTH
+ width = 5
+ height = 7
+ dwidth = 2
+
+/obj/docking_port/mobile/syndicate_fighter/fighter_one
+ name = "syndicate fighter one"
+ id = "SBC_fighter1"
+
+/obj/docking_port/mobile/syndicate_fighter/fighter_two
+ name = "syndicate fighter two"
+ id = "SBC_fighter2"
+
+/obj/docking_port/mobile/syndicate_fighter/fighter_three
+ name = "syndicate fighter three"
+ id = "SBC_fighter3"
+
+/obj/docking_port/mobile/syndicate_corvette
+ name = "syndicate corvette"
+ id = "SBC_corvette"
+ movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
+ hidden = TRUE
+ dir = NORTH
+ port_direction = SOUTH
+ preferred_direction = WEST
+ width = 14
+ dwidth = 6
+ height = 7
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/fighter
+ name = "syndicate fighter navigation computer"
+ desc = "Used to pilot syndicate fighters to commence precision strikes."
+ x_offset = 0
+ y_offset = 3
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/fighter/fighter_one
+ shuttleId = "SBC_fighter1"
+ shuttlePortId = "SBC_fighter1_custom"
+ jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1, "SBC_fighter1_bay" = 1)
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/fighter/fighter_two
+ shuttleId = "SBC_fighter2"
+ shuttlePortId = "SBC_fighter2_custom"
+ jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1, "SBC_fighter2_bay" = 1)
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/fighter/fighter_three
+ shuttleId = "SBC_fighter3"
+ shuttlePortId = "SBC_fighter3_custom"
+ jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1, "SBC_fighter3_bay" = 1)
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/corvette
+ name = "syndicate corvette navigation computer"
+ desc = "Used to pilot the syndicate corvette to board enemy stations and ships."
+ shuttleId = "SBC_corvette"
+ shuttlePortId = "SBC_corvette_custom"
+ jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1, "SBC_corvette_bay" = 1)
+ y_offset = 3
+ x_offset = 0
+
+/obj/machinery/computer/shuttle/starfury/fighter
+ name = "syndicate fighter control console"
+ desc = "A control computer which controls a shuttle which operates from the SBC Starfury.."
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/shuttle/starfury/fighter/fighter_one
+ shuttleId = "SBC_fighter1"
+ possible_destinations = "SBC_fighter1_custom;SBC_fighter1_bay;SBC_fighter2_bay;SBC_fighter3_bay;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/shuttle/starfury/fighter/fighter_two
+ shuttleId = "SBC_fighter2"
+ possible_destinations = "SBC_fighter2_custom;SBC_fighter1_bay;SBC_fighter2_bay;SBC_fighter3_bay;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/shuttle/starfury/fighter/fighter_three
+ shuttleId = "SBC_fighter3"
+ possible_destinations = "SBC_fighter3_custom;SBC_fighter1_bay;SBC_fighter2_bay;SBC_fighter3_bay;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/computer/shuttle/starfury/corvette
+ name = "syndicate corvette control console"
+ desc = "A control computer which controls a shuttle which operates from the SBC Starfury.."
+ shuttleId = "SBC_corvette"
+ possible_destinations = "SBC_corvette_custom;SBC_corvette_bay;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
+ req_access = list(ACCESS_SYNDICATE)
+
+/*
+ * Summons the SBC Starfury, a large syndicate battlecruiser, in Deep Space.
+ * It can be piloted into the station's area.
+ */
+/proc/summon_battlecruiser()
+
+ var/list/candidates = poll_ghost_candidates("Do you wish to be considered for battlecruiser crew?", ROLE_TRAITOR)
+ shuffle_inplace(candidates)
+
+ var/datum/map_template/ship = SSmapping.map_templates["battlecruiser_starfury.dmm"]
+ var/x = rand(TRANSITIONEDGE, world.maxx - TRANSITIONEDGE - ship.width)
+ var/y = rand(TRANSITIONEDGE, world.maxy - TRANSITIONEDGE - ship.height)
+ var/z = SSmapping.empty_space?.z_value
+ if(isnull(z))
+ CRASH("Battlecruiser found no empty space level to load in!")
+
+ var/turf/battlecruiser_loading_turf = locate(x, y, z)
+ if(!battlecruiser_loading_turf)
+ CRASH("Battlecruiser found no turf to load in!")
+
+ if(!ship.load(battlecruiser_loading_turf))
+ CRASH("Loading battlecruiser ship failed!")
+
+ var/datum/team/battlecruiser/team = new()
+ var/obj/machinery/nuclearbomb/selfdestruct/nuke = locate() in GLOB.nuke_list
+ if(nuke.r_code == "ADMIN")
+ nuke.r_code = random_nukecode()
+ team.nuke = nuke
+ team.update_objectives()
+
+ for(var/turf/open/spawned_turf as anything in ship.get_affected_turfs(battlecruiser_loading_turf)) //not as anything to filter out closed turfs
+ for(var/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/spawner in spawned_turf)
+ spawner.antag_team = team
+ if(candidates.len > 0)
+ var/mob/our_candidate = candidates[1]
+ spawner.create(our_candidate)
+ candidates.Splice(1, 2)
+ notify_ghosts(
+ "The battlecruiser has an object of interest: [our_candidate]!",
+ source = our_candidate,
+ action = NOTIFY_ORBIT,
+ header = "Something's Interesting!"
+ )
+ else
+ notify_ghosts(
+ "The battlecruiser has an object of interest: [spawner]!",
+ source = spawner,
+ action = NOTIFY_ORBIT,
+ header="Something's Interesting!"
+ )
+
+ priority_announce("Unidentified armed ship detected near the station.")
diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm
index 66f4f2e1b06..de7a366aae8 100644
--- a/code/modules/shuttle/docking.dm
+++ b/code/modules/shuttle/docking.dm
@@ -209,4 +209,3 @@
continue
var/turf/oldT = moved_atoms[moved_object]
moved_object.lateShuttleMove(oldT, movement_force, movement_direction)
-
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 646771c6c29..55574ce1f6b 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -101,7 +101,7 @@
var/y_off = T.y - origin.y
I.loc = locate(origin.x + x_off, origin.y + y_off, origin.z) //we have to set this after creating the image because it might be null, and images created in nullspace are immutable.
I.layer = ABOVE_NORMAL_TURF_LAYER
- I.plane = 0
+ I.plane = ABOVE_GAME_PLANE
I.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
the_eye.placement_images[I] = list(x_off, y_off)
@@ -189,7 +189,7 @@
var/image/newI = image('icons/effects/alphacolors.dmi', the_eye.loc, "blue")
newI.loc = I.loc //It is highly unlikely that any landing spot including a null tile will get this far, but better safe than sorry.
newI.layer = ABOVE_OPEN_TURF_LAYER
- newI.plane = 0
+ newI.plane = ABOVE_GAME_PLANE
newI.mouse_opacity = 0
the_eye.placed_images += newI
@@ -393,5 +393,3 @@
to_chat(target, span_notice("Jumped to [selected]."))
C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
C.clear_fullscreen("flash", 3)
-
-
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 879e88402b8..a4e5b1a7dd3 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -49,9 +49,10 @@ All ShuttleMove procs go here
/turf/proc/onShuttleMove(turf/newT, list/movement_force, move_dir)
if(newT == src) // In case of in place shuttle rotation shenanigans.
return
- //Destination turf changes
- //Baseturfs is definitely a list or this proc wouldnt be called
+ // Destination turf changes.
+ // Baseturfs is definitely a list or this proc wouldnt be called.
var/shuttle_boundary = baseturfs.Find(/turf/baseturf_skipover/shuttle)
+
if(!shuttle_boundary)
CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]")
var/depth = baseturfs.len - shuttle_boundary + 1
@@ -90,6 +91,7 @@ All ShuttleMove procs go here
SSexplosions.wipe_turf(src)
var/shuttle_boundary = baseturfs.Find(/turf/baseturf_skipover/shuttle)
+
if(shuttle_boundary)
oldT.ScrapeAway(baseturfs.len - shuttle_boundary + 1)
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index c2b0e4e3c32..94b0ea0cf31 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -140,6 +140,7 @@
span_notice("[user] begins to perform surgery on [target]."))
/datum/surgery_step/proc/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = TRUE)
+ SEND_SIGNAL(user, COMSIG_MOB_SURGERY_STEP_SUCCESS, src, target, target_zone, tool, surgery, default_display_results)
if(default_display_results)
display_results(user, target, span_notice("You succeed."),
span_notice("[user] succeeds!"),
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 0b3c0a60120..9ece3458a2d 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -82,6 +82,7 @@
#include "modsuit.dm"
#include "ntnetwork_tests.dm"
#include "outfit_sanity.dm"
+#include "objectives.dm"
#include "pills.dm"
#include "plantgrowth_tests.dm"
#include "preferences.dm"
@@ -105,6 +106,7 @@
#include "strippable.dm"
#include "subsystem_init.dm"
#include "surgeries.dm"
+#include "traitor.dm"
#include "teleporters.dm"
#include "tgui_create_message.dm"
#include "timer_sanity.dm"
diff --git a/code/modules/unit_tests/objectives.dm b/code/modules/unit_tests/objectives.dm
new file mode 100644
index 00000000000..19a7171e675
--- /dev/null
+++ b/code/modules/unit_tests/objectives.dm
@@ -0,0 +1,24 @@
+/datum/unit_test/objectives_category/Run()
+ var/datum/traitor_category_handler/category_handler = allocate(/datum/traitor_category_handler)
+ var/list/objectives_that_exist = list()
+ for(var/datum/traitor_objective_category/category as anything in category_handler.all_categories)
+ for(var/value in category.objectives)
+ TEST_ASSERT(isnum(category.objectives[value]), "[category.type] does not have a valid format for its objectives as an objective category! ([value] requires a weight to be assigned to it)")
+ if(islist(value))
+ recursive_check_list(category.type, value, objectives_that_exist)
+ else
+ objectives_that_exist += value
+
+ for(var/datum/traitor_objective/objective_typepath as anything in subtypesof(/datum/traitor_objective))
+ if(initial(objective_typepath.abstract_type) == objective_typepath)
+ continue
+ if(!(objective_typepath in objectives_that_exist))
+ Fail("[objective_typepath] is not in a traitor category and isn't an abstract type! Place it into a [/datum/traitor_objective_category] or remove it from code.")
+
+/datum/unit_test/objectives_category/proc/recursive_check_list(base_type, list/to_check, list/to_add_to)
+ for(var/value in to_check)
+ TEST_ASSERT(isnum(to_check[value]), "[base_type] does not have a valid format for its objectives as an objective category! ([value] requires a weight to be assigned to it)")
+ if(islist(value))
+ recursive_check_list(base_type, value, to_add_to)
+ else
+ to_add_to += value
diff --git a/code/modules/unit_tests/traitor.dm b/code/modules/unit_tests/traitor.dm
new file mode 100644
index 00000000000..4c08001dc19
--- /dev/null
+++ b/code/modules/unit_tests/traitor.dm
@@ -0,0 +1,26 @@
+/datum/unit_test/traitor/Run()
+ var/datum/dynamic_ruleset/roundstart/traitor/traitor_ruleset = allocate(/datum/dynamic_ruleset/roundstart/traitor)
+ var/list/possible_jobs = SSjob.station_jobs.Copy()
+ possible_jobs -= traitor_ruleset.protected_roles
+ possible_jobs -= traitor_ruleset.restricted_roles
+
+ for(var/job_name in possible_jobs)
+ var/datum/job/job = SSjob.GetJob(job_name)
+ var/mob/living/player = allocate(job.spawn_type)
+ player.mind_initialize()
+ var/datum/mind/mind = player.mind
+ if(ishuman(player))
+ var/mob/living/carbon/human/human = player
+ human.equipOutfit(job.outfit)
+ mind.set_assigned_role(job)
+ var/datum/antagonist/traitor/traitor = mind.add_antag_datum(/datum/antagonist/traitor)
+ if(!traitor.uplink_handler)
+ Fail("[job_name] when made traitor does not have a proper uplink created when spawned in!")
+ for(var/datum/traitor_objective/objective_typepath as anything in subtypesof(/datum/traitor_objective))
+ if(initial(objective_typepath.abstract_type) == objective_typepath)
+ continue
+ var/datum/traitor_objective/objective = allocate(objective_typepath, traitor.uplink_handler)
+ try
+ objective.generate_objective(mind, list())
+ catch(var/exception/exception)
+ Fail("[objective_typepath] failed to generate their objective. Reason: [exception.name] [exception.file]:[exception.line]\n[exception.desc]")
diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
index d86444abdbb..fb516908bab 100644
--- a/code/modules/uplink/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -36,7 +36,7 @@
. = ..()
var/datum/component/uplink/hidden_uplink = GetComponent(/datum/component/uplink)
hidden_uplink.name = "debug uplink"
- hidden_uplink.debug = TRUE
+ hidden_uplink.uplink_handler.debug_mode = TRUE
/obj/item/uplink/nuclear
uplink_flag = UPLINK_NUKE_OPS
@@ -49,7 +49,7 @@
. = ..()
var/datum/component/uplink/hidden_uplink = GetComponent(/datum/component/uplink)
hidden_uplink.name = "debug nuclear uplink"
- hidden_uplink.debug = TRUE
+ hidden_uplink.uplink_handler.debug_mode = TRUE
/obj/item/uplink/nuclear_restricted
uplink_flag = UPLINK_NUKE_OPS
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 7f7a0039239..4c9dbd137a8 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1,76 +1,24 @@
-GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
-
-/proc/get_uplink_items(uplink_flag, allow_sales = TRUE, allow_restricted = TRUE)
- var/list/filtered_uplink_items = list()
- var/list/sale_items = list()
-
- for(var/path in GLOB.uplink_items)
- var/datum/uplink_item/I = new path
- if(!I.item)
- continue
- if (!(I.purchasable_from & uplink_flag))
- continue
- if(I.player_minimum && I.player_minimum > GLOB.joined_player_list.len)
- continue
- if (I.restricted && !allow_restricted)
- continue
-
- if(!filtered_uplink_items[I.category])
- filtered_uplink_items[I.category] = list()
- filtered_uplink_items[I.category][I.name] = I
- if(I.limited_stock < 0 && !I.cant_discount && I.item && I.cost > 1)
- sale_items += I
- if(allow_sales)
- var/datum/team/nuclear/nuclear_team
- if (uplink_flag & UPLINK_NUKE_OPS) // uplink code kind of needs a redesign
- nuclear_team = locate() in GLOB.antagonist_teams // the team discounts could be in a GLOB with this design but it would make sense for them to be team specific...
- if (!nuclear_team)
- create_uplink_sales(3, "Discounted Gear", 1, sale_items, filtered_uplink_items)
- else
- if (!nuclear_team.team_discounts)
- // create 5 unlimited stock discounts
- create_uplink_sales(5, "Discounted Team Gear", -1, sale_items, filtered_uplink_items)
- // Create 10 limited stock discounts
- create_uplink_sales(10, "Limited Stock Team Gear", 1, sale_items, filtered_uplink_items)
- nuclear_team.team_discounts = list("Discounted Team Gear" = filtered_uplink_items["Discounted Team Gear"], "Limited Stock Team Gear" = filtered_uplink_items["Limited Stock Team Gear"])
- else
- for(var/cat in nuclear_team.team_discounts)
- for(var/item in nuclear_team.team_discounts[cat])
- var/datum/uplink_item/D = nuclear_team.team_discounts[cat][item]
- var/datum/uplink_item/O = filtered_uplink_items[initial(D.category)][initial(D.name)]
- O.refundable = FALSE
-
- filtered_uplink_items["Discounted Team Gear"] = nuclear_team.team_discounts["Discounted Team Gear"]
- filtered_uplink_items["Limited Stock Team Gear"] = nuclear_team.team_discounts["Limited Stock Team Gear"]
-
-
- return filtered_uplink_items
-
-/proc/create_uplink_sales(num, category_name, limited_stock, sale_items, uplink_items)
- if (num <= 0)
- return
-
- if(!uplink_items[category_name])
- uplink_items[category_name] = list()
+// TODO: Work into reworked uplinks.
+/proc/create_uplink_sales(num, datum/uplink_category/category, limited_stock, list/sale_items)
+ var/list/sales = list()
+ var/list/sale_items_copy = sale_items.Copy()
for (var/i in 1 to num)
- var/datum/uplink_item/I = pick_n_take(sale_items)
- var/datum/uplink_item/A = new I.type
- var/discount = A.get_discount()
+ var/datum/uplink_item/taken_item = pick_n_take(sale_items_copy)
+ var/datum/uplink_item/uplink_item = new taken_item.type()
+ var/discount = uplink_item.get_discount()
var/list/disclaimer = list("Void where prohibited.", "Not recommended for children.", "Contains small parts.", "Check local laws for legality in region.", "Do not taunt.", "Not responsible for direct, indirect, incidental or consequential damages resulting from any defect, error or failure to perform.", "Keep away from fire or flames.", "Product is provided \"as is\" without any implied or expressed warranties.", "As seen on TV.", "For recreational use only.", "Use only as directed.", "16% sales tax will be charged for orders originating within Space Nebraska.")
- A.limited_stock = limited_stock
- I.refundable = FALSE //THIS MAN USES ONE WEIRD TRICK TO GAIN FREE TC, CODERS HATES HIM!
- A.refundable = FALSE
- if(A.cost >= 20) //Tough love for nuke ops
+ uplink_item.limited_stock = limited_stock
+ if(uplink_item.cost >= 20) //Tough love for nuke ops
discount *= 0.5
- A.category = category_name
- A.cost = max(round(A.cost * discount),1)
- A.name += " ([round(((initial(A.cost)-A.cost)/initial(A.cost))*100)]% off!)"
- A.desc += " Normally costs [initial(A.cost)] TC. All sales final. [pick(disclaimer)]"
- A.item = I.item
-
- uplink_items[category_name][A.name] = A
+ uplink_item.category = category
+ uplink_item.cost = max(round(uplink_item.cost * discount),1)
+ uplink_item.name += " ([round(((initial(uplink_item.cost)-uplink_item.cost)/initial(uplink_item.cost))*100)]% off!)"
+ uplink_item.desc += " Normally costs [initial(uplink_item.cost)] TC. All sales final. [pick(disclaimer)]"
+ uplink_item.item = taken_item.item
+ sales += uplink_item
+ return sales
/**
* Uplink Items
@@ -78,37 +26,58 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
* Items that can be spawned from an uplink. Can be limited by gamemode.
**/
/datum/uplink_item
+ /// Name of the uplink item
var/name = "item name"
- var/category = "item category"
+ /// Category of the uplink
+ var/datum/uplink_category/category
+ /// Description of the uplink
var/desc = "item description"
- var/item = null // Path to the item to spawn.
- var/refund_path = null // Alternative path for refunds, in case the item purchased isn't what is actually refunded (ie: holoparasites).
+ /// Path to the item to spawn.
+ var/item = null
+ /// Alternative path for refunds, in case the item purchased isn't what is actually refunded (ie: holoparasites).
+ var/refund_path = null
+ /// Cost of the item.
var/cost = 0
- var/refund_amount = 0 // specified refund amount in case there needs to be a TC penalty for refunds.
+ /// Amount of TC to refund, in case there's a TC penalty for refunds.
+ var/refund_amount = 0
+ /// Whether this item is refundable or not.
var/refundable = FALSE
- var/surplus = 100 // Chance of being included in the surplus crate.
+ // Chance of being included in the surplus crate.
+ var/surplus = 100
+ /// Whether this can be discounted or not
var/cant_discount = FALSE
+ /// How many items of this stock can be purchased.
var/limited_stock = -1 //Setting this above zero limits how many times this item can be bought by the same traitor in a round, -1 is unlimited
/// A bitfield to represent what uplinks can purchase this item.
/// See [`code/__DEFINES/uplink.dm`].
var/purchasable_from = ALL
- var/list/restricted_roles = list() //If this uplink item is only available to certain roles. Roles are dependent on the frequency chip or stored ID.
- var/player_minimum //The minimum crew size needed for this item to be added to uplinks.
+ /// If this uplink item is only available to certain roles. Roles are dependent on the frequency chip or stored ID.
+ var/list/restricted_roles = list()
+ /// The minimum amount of progression needed for this item to be added to uplinks.
+ var/progression_minimum = 0
+ /// Whether this purchase is visible in the purchase log.
var/purchase_log_vis = TRUE // Visible in the purchase log?
- var/restricted = FALSE // Adds restrictions for VR/Events
- var/list/restricted_species //Limits items to a specific species. Hopefully.
- var/illegal_tech = TRUE // Can this item be deconstructed to unlock certain techweb research nodes?
+ /// Whether this purchase is restricted or not (VR/Events related)
+ var/restricted = FALSE
+ /// Can this item be deconstructed to unlock certain techweb research nodes?
+ var/illegal_tech = TRUE
+
+/datum/uplink_category
+ /// Name of the category
+ var/name
+ /// Weight of the category. Used to determine the positioning in the uplink. High weight = appears first
+ var/weight = 0
/datum/uplink_item/proc/get_discount()
return pick(4;0.75,2;0.5,1;0.25)
-/datum/uplink_item/proc/purchase(mob/user, datum/component/uplink/U)
- var/atom/A = spawn_item(item, user, U)
- log_uplink("[key_name(user)] purchased [src] for [cost] telecrystals from [U.parent]'s uplink")
- if(purchase_log_vis && U.purchase_log)
- U.purchase_log.LogPurchase(A, src, cost)
+/datum/uplink_item/proc/purchase(mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
+ var/atom/A = spawn_item(item, user, uplink_handler, source)
+ log_uplink("[key_name(user)] purchased [src] for [cost] telecrystals from [source]'s uplink")
+ if(purchase_log_vis && uplink_handler.purchase_log)
+ uplink_handler.purchase_log.LogPurchase(A, src, cost)
-/datum/uplink_item/proc/spawn_item(spawn_path, mob/user, datum/component/uplink/U)
+/datum/uplink_item/proc/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
if(!spawn_path)
return
var/atom/A
@@ -124,2000 +93,21 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
to_chat(user, span_boldnotice("[A] materializes onto the floor!"))
return A
+/datum/uplink_category/discounts
+ name = "Discounted Gear"
+ weight = -1
+
+/datum/uplink_category/discount_team_gear
+ name = "Discounted Team Gear"
+ weight = -1
+
+/datum/uplink_category/limited_discount_team_gear
+ name = "Limited Stock Team Gear"
+ weight = -2
+
//Discounts (dynamically filled above)
/datum/uplink_item/discounts
- category = "Discounts"
-
-//All bundles and telecrystals
-/datum/uplink_item/bundles_tc
- category = "Bundles"
- surplus = 0
- cant_discount = TRUE
-
-/datum/uplink_item/bundles_tc/chemical
- name = "Bioterror bundle"
- desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \
- box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use."
- item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
- cost = 30 // normally 42
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/bundles_tc/bulldog
- name = "Bulldog bundle"
- desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \
- Bulldog shotgun, two 12g buckshot drums, and a pair of Thermal imaging goggles."
- item = /obj/item/storage/backpack/duffelbag/syndie/bulldogbundle
- cost = 13 // normally 16
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/bundles_tc/c20r
- name = "C-20r bundle"
- desc = "Old Faithful: The classic C-20r, bundled with two magazines and a (surplus) suppressor at discount price."
- item = /obj/item/storage/backpack/duffelbag/syndie/c20rbundle
- cost = 14 // normally 16
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/bundles_tc/cyber_implants
- name = "Cybernetic Implants Bundle"
- desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
- item = /obj/item/storage/box/cyber_implants
- cost = 40
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/bundles_tc/medical
- name = "Medical bundle"
- desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \
- a Donksoft LMG, a box of riot darts and a pair of magboots to rescue your friends in no-gravity environments."
- item = /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
- cost = 15 // normally 20
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/bundles_tc/sniper
- name = "Sniper bundle"
- desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, \
- two soporific knockout magazines, a free surplus suppressor, and a sharp-looking tactical turtleneck suit. \
- We'll throw in a free red tie if you order NOW."
- item = /obj/item/storage/briefcase/sniperbundle
- cost = 20 // normally 26
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/bundles_tc/firestarter
- name = "Spetsnaz Pyro bundle"
- desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite MODsuit, \
- Stechkin APS machine pistol, two incendiary magazines, a minibomb and a stimulant syringe. \
- Order NOW and comrade Boris will throw in an extra tracksuit."
- item = /obj/item/storage/backpack/duffelbag/syndie/firestarter
- cost = 30
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/bundles_tc/contract_kit
- name = "Contract Kit"
- desc = "The Syndicate have offered you the chance to become a contractor, take on kidnapping contracts for TC and cash payouts. Upon purchase, \
- you'll be granted your own contract uplink embedded within the supplied tablet computer. Additionally, you'll be granted \
- standard contractor gear to help with your mission - comes supplied with the tablet, specialised space suit, chameleon jumpsuit and mask, \
- agent card, specialised contractor baton, and three randomly selected low cost items. Can include otherwise unobtainable items."
- item = /obj/item/storage/box/syndicate/contract_kit
- cost = 20
- player_minimum = 20
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/bundles_tc/bundle_a
- name = "Syndi-kit Tactical"
- desc = "Syndicate Bundles, also known as Syndi-Kits, are specialized groups of items that arrive in a plain box. \
- These items are collectively worth more than 20 telecrystals, but you do not know which specialization \
- you will receive. May contain discontinued and/or exotic items."
- item = /obj/item/storage/box/syndicate/bundle_a
- cost = 20
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/bundles_tc/bundle_b
- name = "Syndi-kit Special"
- desc = "Syndicate Bundles, also known as Syndi-Kits, are specialized groups of items that arrive in a plain box. \
- In Syndi-kit Special, you will receive items used by famous syndicate agents of the past. Collectively worth more than 20 telecrystals, the syndicate loves a good throwback."
- item = /obj/item/storage/box/syndicate/bundle_b
- cost = 20
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/bundles_tc/surplus
- name = "Syndicate Surplus Crate"
- desc = "A dusty crate from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
- but you never know. Contents are sorted to always be worth 50 TC."
- item = /obj/structure/closet/crate
- cost = 20
- player_minimum = 25
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
- var/starting_crate_value = 50
-
-/datum/uplink_item/bundles_tc/surplus/super
- name = "Super Surplus Crate"
- desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
- but you never know. Contents are sorted to always be worth 125 TC."
- cost = 50 //SKYRAT EDIT CHANGE - ORIGINAL: 40
- player_minimum = 40
- starting_crate_value = 145 //SKYRAT EDIT CHANGE - ORIGINAL: 125
-
-/datum/uplink_item/bundles_tc/surplus/purchase(mob/user, datum/component/uplink/U)
- var/list/uplink_items = get_uplink_items(UPLINK_TRAITORS, FALSE)
-
- var/crate_value = starting_crate_value
- var/obj/structure/closet/crate/C = spawn_item(/obj/structure/closet/crate, user, U)
- log_uplink("[key_name(user)] puchased [src] worth [crate_value] telecrystals for [cost] telecrystals using [U.parent]'s uplink")
- if(U.purchase_log)
- U.purchase_log.LogPurchase(C, src, cost)
- while(crate_value)
- var/category = pick(uplink_items)
- var/item = pick(uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
-
- if(!I.surplus || prob(100 - I.surplus))
- continue
- if(crate_value < I.cost)
- continue
- crate_value -= I.cost
- var/obj/goods = new I.item(C)
- log_uplink("- [key_name(user)] received [goods] from [src]")
- if(U.purchase_log)
- U.purchase_log.LogPurchase(goods, I, 0)
- return C
-
-/datum/uplink_item/bundles_tc/random
- name = "Random Item"
- desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet."
- item = /obj/effect/gibspawner/generic // non-tangible item because techwebs use this path to determine illegal tech
- cost = 0
-
-/datum/uplink_item/bundles_tc/random/purchase(mob/user, datum/component/uplink/U)
- var/list/uplink_items = U.uplink_items
- var/list/possible_items = list()
- for(var/category in uplink_items)
- for(var/item in uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
- if(src == I || !I.item)
- continue
- if(U.telecrystals < I.cost)
- continue
- if(I.limited_stock == 0)
- continue
- possible_items += I
-
- if(possible_items.len)
- var/datum/uplink_item/I = pick(possible_items)
- log_uplink("[key_name(user)] purchased a random uplink item from [U.parent]'s uplink with [U.telecrystals] telecrystals remaining")
- SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(I.name))
- U.MakePurchase(user, I)
-
-/datum/uplink_item/bundles_tc/telecrystal
- name = "1 Raw Telecrystal"
- desc = "A telecrystal in its rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
- item = /obj/item/stack/telecrystal
- cost = 1
- // Don't add telecrystals to the purchase_log since
- // it's just used to buy more items (including itself!)
- purchase_log_vis = FALSE
-
-/datum/uplink_item/bundles_tc/telecrystal/five
- name = "5 Raw Telecrystals"
- desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
- item = /obj/item/stack/telecrystal/five
- cost = 5
-
-/datum/uplink_item/bundles_tc/telecrystal/twenty
- name = "20 Raw Telecrystals"
- desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
- item = /obj/item/stack/telecrystal/twenty
- cost = 20
-
-// Dangerous Items
-/datum/uplink_item/dangerous
- category = "Conspicuous Weapons"
-
-/datum/uplink_item/dangerous/rawketlawnchair
- name = "84mm Rocket Propelled Grenade Launcher"
- desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
- Guaranteed to send your target out with a bang or your money back!"
- item = /obj/item/gun/ballistic/rocketlauncher
- cost = 8
- surplus = 30
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/pie_cannon
- name = "Banana Cream Pie Cannon"
- desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
- cost = 10
- item = /obj/item/pneumatic_cannon/pie/selfcharge
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/bananashield
- name = "Bananium Energy Shield"
- desc = "A clown's most powerful defensive weapon, this personal shield provides near immunity to ranged energy attacks \
- by bouncing them back at the ones who fired them. It can also be thrown to bounce off of people, slipping them, \
- and returning to you even if you miss. WARNING: DO NOT ATTEMPT TO STAND ON SHIELD WHILE DEPLOYED, EVEN IF WEARING ANTI-SLIP SHOES."
- item = /obj/item/shield/energy/bananium
- cost = 16
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/clownsword
- name = "Bananium Energy Sword"
- desc = "An energy sword that deals no damage, but will slip anyone it contacts, be it by melee attack, thrown \
- impact, or just stepping on it. Beware friendly fire, as even anti-slip shoes will not protect against it."
- item = /obj/item/melee/energy/sword/bananium
- cost = 3
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/clownoppin
- name = "Ultra Hilarious Firing Pin"
- desc = "A firing pin that, when inserted into a gun, makes that gun only useable by clowns and clumsy people and makes that gun honk whenever anyone tries to fire it."
- cost = 1 //much cheaper for clown ops than for clowns
- item = /obj/item/firing_pin/clown/ultra
- purchasable_from = UPLINK_CLOWN_OPS
- illegal_tech = FALSE
-
-/datum/uplink_item/dangerous/clownopsuperpin
- name = "Super Ultra Hilarious Firing Pin"
- desc = "Like the ultra hilarious firing pin, except the gun you insert this pin into explodes when someone who isn't clumsy or a clown tries to fire it."
- cost = 4 //much cheaper for clown ops than for clowns
- item = /obj/item/firing_pin/clown/ultra/selfdestruct
- purchasable_from = UPLINK_CLOWN_OPS
- illegal_tech = FALSE
-
-/datum/uplink_item/dangerous/bioterror
- name = "Biohazardous Chemical Sprayer"
- desc = "A handheld chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger \
- Cooperative, the deadly blend it comes stocked with will disorient, damage, and disable your foes... \
- Use with extreme caution, to prevent exposure to yourself and your fellow operatives."
- item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
- cost = 20
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/throwingweapons
- name = "Box of Throwing Weapons"
- desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \
- throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
- item = /obj/item/storage/box/syndie_kit/throwing_weapons
- cost = 3
- illegal_tech = FALSE
-
-/datum/uplink_item/dangerous/shotgun
- name = "Bulldog Shotgun"
- desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \
- quarter anti-personnel engagements."
- item = /obj/item/gun/ballistic/shotgun/bulldog
- cost = 8
- surplus = 40
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/smg
- name = "C-20r Submachine Gun"
- desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \
- 24-round magazine and is compatible with suppressors."
- item = /obj/item/gun/ballistic/automatic/c20r
- cost = 13
- surplus = 40
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/doublesword
- name = "Double-Bladed Energy Sword"
- desc = "The double-bladed energy sword does slightly more damage than a standard energy sword and will deflect \
- all energy projectiles, but requires two hands to wield."
- item = /obj/item/dualsaber
- player_minimum = 25
- cost = 16
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/doublesword/get_discount()
- return pick(4;0.8,2;0.65,1;0.5)
-
-/datum/uplink_item/dangerous/sword
- name = "Energy Sword"
- desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
- pocketed when inactive. Activating it produces a loud, distinctive noise."
- item = /obj/item/melee/energy/sword/saber
- cost = 8
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/shield
- name = "Energy Shield"
- desc = "An incredibly useful personal shield projector, capable of reflecting energy projectiles and defending \
- against other attacks. Pair with an Energy Sword for a killer combination."
- item = /obj/item/shield/energy
- cost = 5 //SKYRAT EDIT CHANGE: ORIGINAL: 16
- surplus = 20
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/flamethrower
- name = "Flamethrower"
- desc = "A flamethrower, fueled by a portion of highly flammable plasma stolen previously from Nanotrasen \
- stations. Make a statement by roasting the filth in their own greed. Use with caution."
- item = /obj/item/flamethrower/full/tank
- cost = 4
- surplus = 40
- purchasable_from = UPLINK_NUKE_OPS
- illegal_tech = FALSE
-
-/datum/uplink_item/dangerous/rapid
- name = "Gloves of the North Star"
- desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk."
- item = /obj/item/clothing/gloves/rapid
- cost = 12 //SKYRAT EDIT: Original Value (8)
-
-/datum/uplink_item/dangerous/guardian
- name = "Holoparasites"
- desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
- organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
- item = /obj/item/storage/box/syndie_kit/guardian
- cost = 18
- surplus = 0
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
- player_minimum = 25
- restricted = TRUE
-
-/datum/uplink_item/dangerous/machinegun
- name = "L6 Squad Automatic Weapon"
- desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
- This deadly weapon has a massive 50-round magazine of devastating 7.12x82mm ammunition."
- item = /obj/item/gun/ballistic/automatic/l6_saw
- cost = 18
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/carbine
- name = "M-90gl Carbine"
- desc = "A fully-loaded, specialized three-round burst carbine that fires 5.56mm ammunition from a 30 round magazine \
- with a 40mm underbarrel grenade launcher. Use secondary-fire to fire the grenade launcher."
- item = /obj/item/gun/ballistic/automatic/m90
- cost = 14
- surplus = 50
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/powerfist
- name = "Power Fist"
- desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply.\
- Upon hitting a target, the piston-ram will extend forward to make contact for some serious damage. \
- Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \
- deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
- item = /obj/item/melee/powerfist
- cost = 6
-
-/datum/uplink_item/dangerous/sniper
- name = "Sniper Rifle"
- desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
- item = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
- cost = 16
- surplus = 25
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/pistol
- name = "Makarov Pistol"
- desc = "A small, easily concealable handgun that uses 9mm auto rounds in 8-round magazines and is compatible \
- with suppressors."
- item = /obj/item/gun/ballistic/automatic/pistol
- cost = 7
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/aps
- name = "Stechkin APS Machine Pistol"
- desc = "An ancient Soviet machine pistol, refurbished for the modern age. Uses 9mm auto rounds in 15-round magazines and is compatible \
- with suppressors. The gun fires in three round bursts."
- item = /obj/item/gun/ballistic/automatic/pistol/aps
- cost = 10
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/surplus_smg
- name = "Surplus SMG"
- desc = "A horribly outdated automatic weapon. Why would you want to use this?"
- item = /obj/item/gun/ballistic/automatic/plastikov
- cost = 2
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/dangerous/revolver
- name = "Syndicate Revolver"
- desc = "A brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
- item = /obj/item/gun/ballistic/revolver
- cost = 13
- surplus = 50
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/foamsmg
- name = "Toy Submachine Gun"
- desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
- item = /obj/item/gun/ballistic/automatic/c20r/toy
- cost = 5
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/foammachinegun
- name = "Toy Machine Gun"
- desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating \
- riot grade darts, that can briefly incapacitate someone in just one volley."
- item = /obj/item/gun/ballistic/automatic/l6_saw/toy
- cost = 10
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/dangerous/foampistol
- name = "Toy Pistol with Riot Darts"
- desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade \
- darts effective at incapacitating a target."
- item = /obj/item/gun/ballistic/automatic/pistol/toy/riot
- cost = 2
- surplus = 10
-
-// Stealthy Weapons
-/datum/uplink_item/stealthy_weapons
- category = "Stealthy Weapons"
-
-/datum/uplink_item/stealthy_weapons/combatglovesplus
- name = "Combat Gloves Plus"
- desc = "A pair of gloves that are fireproof and electrically insulated, however unlike the regular Combat Gloves these use nanotechnology \
- to teach the martial art of krav maga to the wearer."
- item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
- cost = 5
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- surplus = 0
-
-/datum/uplink_item/stealthy_weapons/cqc
- name = "CQC Manual"
- desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
- item = /obj/item/book/granter/martial/cqc
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- cost = 13
- surplus = 0
-
-/datum/uplink_item/stealthy_weapons/dart_pistol
- name = "Dart Pistol"
- desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any \
- space a small item can."
- item = /obj/item/gun/syringe/syndicate
- cost = 4
- surplus = 50
-
-/datum/uplink_item/stealthy_weapons/dehy_carp
- name = "Dehydrated Space Carp"
- desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in \
- your hand before use so it knows not to kill you."
- item = /obj/item/toy/plush/carpplushie/dehy_carp
- cost = 1
-
-/datum/uplink_item/stealthy_weapons/edagger
- name = "Energy Dagger"
- desc = "A dagger made of energy that looks and functions as a pen when off."
- item = /obj/item/pen/edagger
- cost = 2
-
-/datum/uplink_item/stealthy_weapons/martialarts
- name = "Martial Arts Scroll"
- desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat \
- and gain the ability to swat bullets from the air, but you will also refuse to use dishonorable ranged weaponry."
- item = /obj/item/book/granter/martial/carp
- player_minimum = 25
- cost = 13
- surplus = 0
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/stealthy_weapons/crossbow
- name = "Miniature Energy Crossbow"
- desc = "A short bow mounted across a tiller in miniature. \
- Small enough to fit into a pocket or slip into a bag unnoticed. \
- It will synthesize and fire bolts tipped with a debilitating \
- toxin that will damage and disorient targets, causing them to \
- slur as if inebriated. It can produce an infinite number \
- of bolts, but takes time to automatically recharge after each shot."
- item = /obj/item/gun/energy/kinetic_accelerator/crossbow
- player_minimum = 25
- cost = 10
- surplus = 50
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/stealthy_weapons/crossbow/New()
- . = ..()
- if(SSevents.holidays?[HALLOWEEN])
- item = /obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
- desc += " Happy Halloween!"
-
-/datum/uplink_item/stealthy_weapons/origami_kit
- name = "Boxed Origami Kit"
- desc = "This box contains a guide on how to craft masterful works of origami, allowing you to transform normal pieces of paper into \
- perfectly aerodynamic (and potentially lethal) paper airplanes."
- item = /obj/item/storage/box/syndie_kit/origami_bundle
- cost = 12 //SKYRAT EDIT: Original value (14)
- surplus = 0
- purchasable_from = ~UPLINK_NUKE_OPS //clown ops intentionally left in, because that seems like some s-tier shenanigans.
-
-/datum/uplink_item/stealthy_weapons/traitor_chem_bottle
- name = "Poison Kit"
- desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application."
- item = /obj/item/storage/box/syndie_kit/chemical
- cost = 6
- surplus = 50
-
-//SKYRAT EDIT REMOVAL BEGIN
-/*
-/datum/uplink_item/stealthy_weapons/romerol_kit
- name = "Romerol"
- desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. \
- On death, these nodules take control of the dead body, causing limited revivification, \
- along with slurred speech, aggression, and the ability to infect others with this agent."
- item = /obj/item/storage/box/syndie_kit/romerol
- cost = 25
- cant_discount = TRUE
-*/
-//SKYRAT EDIT REMOVAL END
-
-/datum/uplink_item/stealthy_weapons/sleepy_pen
- name = "Sleepy Pen"
- desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a \
- strong anesthetic and a chemical that prevents the target from speaking. \
- The pen holds one dose of the mixture, and can be refilled with any chemicals. Note that before the target \
- falls asleep, they will be able to move and act."
- item = /obj/item/pen/sleepy
- cost = 4
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/stealthy_weapons/suppressor
- name = "Suppressor"
- desc = "This suppressor will silence the shots of the weapon it is attached to for increased stealth and superior ambushing capability. It is compatible with many small ballistic guns including the Makarov, Stechkin APS and C-20r, but not revolvers or energy guns."
- item = /obj/item/suppressor
- cost = 3
- surplus = 10
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/stealthy_weapons/holster
- name = "Syndicate Holster"
- desc = "A useful little device that allows for inconspicuous carrying of guns using chameleon technology. It also allows for badass gun-spinning."
- item = /obj/item/storage/belt/holster/chameleon
- cost = 1
-
-// Ammunition
-/datum/uplink_item/ammo
- category = "Ammunition"
- surplus = 40
-
-/datum/uplink_item/ammo/pistol
- name = "9mm Handgun Magazine"
- desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol."
- item = /obj/item/ammo_box/magazine/m9mm
- cost = 1
- purchasable_from = ~UPLINK_CLOWN_OPS
- illegal_tech = FALSE
-
-/datum/uplink_item/ammo/pistolap
- name = "9mm Armour Piercing Magazine"
- desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \
- These rounds are less effective at injuring the target but penetrate protective gear."
- item = /obj/item/ammo_box/magazine/m9mm/ap
- cost = 2
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/ammo/pistolhp
- name = "9mm Hollow Point Magazine"
- desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \
- These rounds are more damaging but ineffective against armour."
- item = /obj/item/ammo_box/magazine/m9mm/hp
- cost = 3
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/ammo/pistolfire
- name = "9mm Incendiary Magazine"
- desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \
- Loaded with incendiary rounds which inflict little damage, but ignite the target."
- item = /obj/item/ammo_box/magazine/m9mm/fire
- cost = 2
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/ammo/pistolaps
- name = "9mm Stechkin APS Magazine"
- desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS machine pistol."
- item = /obj/item/ammo_box/magazine/m9mm_aps
- cost = 2
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/shotgun
- cost = 2
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/shotgun/bag
- name = "12g Ammo Duffel Bag"
- desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun
- cost = 12
-
-/datum/uplink_item/ammo/shotgun/buck
- name = "12g Buckshot Drum"
- desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
- item = /obj/item/ammo_box/magazine/m12g
-
-/datum/uplink_item/ammo/shotgun/dragon
- name = "12g Dragon's Breath Drum"
- desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \
- 'I'm a fire starter, twisted fire starter!'"
- item = /obj/item/ammo_box/magazine/m12g/dragon
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/shotgun/meteor
- name = "12g Meteorslug Shells"
- desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \
- Great for blasting airlocks off their frames and knocking down enemies."
- item = /obj/item/ammo_box/magazine/m12g/meteor
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/shotgun/slug
- name = "12g Slug Drum"
- desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \
- Now 8 times less likely to shoot your pals."
- cost = 3
- item = /obj/item/ammo_box/magazine/m12g/slug
-
-/datum/uplink_item/ammo/revolver
- name = ".357 Speed Loader"
- desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \
- For when you really need a lot of things dead."
- item = /obj/item/ammo_box/a357
- cost = 4
- purchasable_from = ~UPLINK_CLOWN_OPS
- illegal_tech = FALSE
-
-/datum/uplink_item/ammo/a40mm
- name = "40mm Grenade Box"
- desc = "A box of 40mm HE grenades for use with the M-90gl's under-barrel grenade launcher. \
- Your teammates will ask you to not shoot these down small hallways."
- item = /obj/item/ammo_box/a40mm
- cost = 6
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/smg/bag
- name = ".45 Ammo Duffel Bag"
- desc = "A duffel bag filled with enough .45 ammo to supply an entire team, at a discounted price."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/smg
- cost = 20 //instead of 27 TC
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/smg
- name = ".45 SMG Magazine"
- desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun."
- item = /obj/item/ammo_box/magazine/smgm45
- cost = 3
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/smgap
- name = ".45 Armor Piercing SMG Magazine"
- desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun.\
- These rounds are less effective at injuring the target but penetrate protective gear."
- item = /obj/item/ammo_box/magazine/smgm45/ap
- cost = 5
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/smgfire
- name = ".45 Incendiary SMG Magazine"
- desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun.\
- Loaded with incendiary rounds which inflict little damage, but ignite the target."
- item = /obj/item/ammo_box/magazine/smgm45/incen
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/sniper
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/sniper/basic
- name = ".50 Magazine"
- desc = "An additional standard 6-round magazine for use with .50 sniper rifles."
- item = /obj/item/ammo_box/magazine/sniper_rounds
-
-/datum/uplink_item/ammo/sniper/penetrator
- name = ".50 Penetrator Magazine"
- desc = "A 5-round magazine of penetrator ammo designed for use with .50 sniper rifles. \
- Can pierce walls and multiple enemies."
- item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator
- cost = 5
-
-/datum/uplink_item/ammo/sniper/soporific
- name = ".50 Soporific Magazine"
- desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
- item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
- cost = 6
-
-/datum/uplink_item/ammo/carbine
- name = "5.56mm Toploader Magazine"
- desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
- These bullets pack less punch than 7.12x82mm rounds, but they still offer more power than .45 ammo due to their innate armour penetration."
- item = /obj/item/ammo_box/magazine/m556
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/carbinephase
- name = "5.56mm Toploader Phasic Magazine"
- desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
- These bullets are made from an experimental alloy, 'Ghost Lead', that allows it to pass through almost any non-organic material. \
- The name is a misnomer. It doesn't contain any lead whatsoever!"
- item = /obj/item/ammo_box/magazine/m556/phasic
- cost = 8
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/machinegun
- cost = 6
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/machinegun/basic
- name = "7.12x82mm Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use with the L6 SAW. \
- By the time you need to use this, you'll already be standing on a pile of corpses."
- item = /obj/item/ammo_box/magazine/mm712x82
-
-/datum/uplink_item/ammo/machinegun/ap
- name = "7.12x82mm (Armor Penetrating) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with special properties \
- to puncture even the most durable armor."
- item = /obj/item/ammo_box/magazine/mm712x82/ap
- cost = 9
-
-/datum/uplink_item/ammo/machinegun/hollow
- name = "7.12x82mm (Hollow-Point) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \
- with the unarmored masses of crew."
- item = /obj/item/ammo_box/magazine/mm712x82/hollow
-
-/datum/uplink_item/ammo/machinegun/incen
- name = "7.12x82mm (Incendiary) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; tipped with a special flammable \
- mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
- item = /obj/item/ammo_box/magazine/mm712x82/incen
-
-/datum/uplink_item/ammo/machinegun/match
- name = "7.12x82mm (Match) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; you didn't know there was a demand for match grade \
- precision bullet hose ammo, but these rounds are finely tuned and perfect for ricocheting off walls all fancy-like."
- item = /obj/item/ammo_box/magazine/mm712x82/match
- cost = 10
-
-/datum/uplink_item/ammo/rocket
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/rocket/basic
- name = "84mm HE Rocket"
- desc = "A low-yield anti-personnel HE rocket. Gonna take you out in style!"
- item = /obj/item/ammo_casing/caseless/rocket
- cost = 4
-
-/datum/uplink_item/ammo/rocket/hedp
- name = "84mm HEDP Rocket"
- desc = "A high-yield HEDP rocket; extremely effective against armored targets, as well as surrounding personnel. \
- Strike fear into the hearts of your enemies."
- item = /obj/item/ammo_casing/caseless/rocket/hedp
- cost = 6
-
-/datum/uplink_item/ammo/toydarts
- name = "Box of Riot Darts"
- desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
- item = /obj/item/ammo_box/foambox/riot
- cost = 2
- surplus = 0
- illegal_tech = FALSE
-
-/datum/uplink_item/ammo/bioterror
- name = "Box of Bioterror Syringes"
- desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor \
- and broca systems, making it impossible for them to move or speak for some time."
- item = /obj/item/storage/box/syndie_kit/bioterror
- cost = 6
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/ammo/surplus_smg
- name = "Surplus SMG Magazine"
- desc = "A cylindrical magazine designed for the PP-95 SMG."
- item = /obj/item/ammo_box/magazine/plastikov9mm
- cost = 1
- purchasable_from = UPLINK_NUKE_OPS
- illegal_tech = FALSE
-
-/datum/uplink_item/ammo/mech/bag
- name = "Mech Support Kit Bag"
- desc = "A duffel bag containing ammo for four full reloads of the scattershotm which is equipped on standard Dark Gygax and Mauler exosuits. Also comes with some support equipment for maintaining the mech, including tools and an inducer."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mech
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/ammo/mauler/bag
- name = "Mauler Ammo Bag"
- desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Mauler exosuit."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler
- cost = 6
- purchasable_from = UPLINK_NUKE_OPS
-
-//Grenades and Explosives
-/datum/uplink_item/explosives
- category = "Explosives"
-
-/datum/uplink_item/explosives/bioterrorfoam
- name = "Bioterror Foam Grenade"
- desc = "A powerful chemical foam grenade which creates a deadly torrent of foam that will mute, blind, confuse, \
- mutate, and irritate carbon lifeforms. Specially brewed by Tiger Cooperative chemical weapons specialists \
- using additional spore toxin. Ensure suit is sealed before use."
- item = /obj/item/grenade/chem_grenade/bioterrorfoam
- cost = 5
- surplus = 35
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/explosives/bombanana
- name = "Bombanana"
- desc = "A banana with an explosive taste! discard the peel quickly, as it will explode with the force of a Syndicate minibomb \
- a few seconds after the banana is eaten."
- item = /obj/item/food/grown/banana/bombanana
- cost = 4 //it is a bit cheaper than a minibomb because you have to take off your helmet to eat it, which is how you arm it
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/explosives/buzzkill
- name = "Buzzkill Grenade Box"
- desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
- with random toxins. Courtesy of the BLF and Tiger Cooperative."
- item = /obj/item/storage/box/syndie_kit/bee_grenades
- cost = 15
- surplus = 35
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/explosives/c4
- name = "Composition C-4"
- desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, sabotage equipment, or connect \
- an assembly to it in order to alter the way it detonates. It can be attached to almost all objects and has a modifiable timer with a \
- minimum setting of 10 seconds."
- item = /obj/item/grenade/c4
- cost = 1
-
-/datum/uplink_item/explosives/c4bag
- name = "Bag of C-4 explosives"
- desc = "Because sometimes quantity is quality. Contains 10 C-4 plastic explosives."
- item = /obj/item/storage/backpack/duffelbag/syndie/c4
- cost = 8 //20% discount!
- cant_discount = TRUE
-
-/datum/uplink_item/explosives/x4bag
- name = "Bag of X-4 explosives"
- desc = "Contains 3 X-4 shaped plastic explosives. Similar to C4, but with a stronger blast that is directional instead of circular. \
- X-4 can be placed on a solid surface, such as a wall or window, and it will blast through the wall, injuring anything on the opposite side, while being safer to the user. \
- For when you want a controlled explosion that leaves a wider, deeper, hole."
- item = /obj/item/storage/backpack/duffelbag/syndie/x4
- cost = 4 //
- cant_discount = TRUE
-
-/datum/uplink_item/explosives/clown_bomb_clownops
- name = "Clown Bomb"
- desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
- with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
- movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
- transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so."
- item = /obj/item/sbeacondrop/clownbomb
- cost = 15
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-//SKYRAT EDIT REMOVAL BEGIN
-/*
-/datum/uplink_item/explosives/detomatix
- name = "Detomatix PDA Cartridge"
- desc = "When inserted into a personal digital assistant, this cartridge gives you the opportunity to \
- send up to six forged messages that will make PDAs of crewmembers explode when they try to reply to them. \
- The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
- item = /obj/item/cartridge/virus/syndicate
- cost = 4
- restricted = TRUE
-*/
-//SKYRAT EDIT REMOVAL END
-
-/datum/uplink_item/explosives/emp
- name = "EMP Grenades and Implanter Kit"
- desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \
- security's energy weapons and silicon lifeforms when you're in a tight spot."
- item = /obj/item/storage/box/syndie_kit/emp
- cost = 2
-
-/datum/uplink_item/explosives/virus_grenade
- name = "Fungal Tuberculosis Grenade"
- desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) \
- autoinjectors for rapid application on up to two targets each, a syringe, and a bottle containing \
- the BVAK solution."
- item = /obj/item/storage/box/syndie_kit/tuberculosisgrenade
- cost = 12
- surplus = 35
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- restricted = TRUE
-
-/datum/uplink_item/explosives/grenadier
- name = "Grenadier's belt"
- desc = "A belt containing 26 lethally dangerous and destructive grenades. Comes with an extra multitool and screwdriver."
- item = /obj/item/storage/belt/grenade/full
- purchasable_from = UPLINK_NUKE_OPS
- cost = 22
- surplus = 0
-
-/datum/uplink_item/explosives/pizza_bomb
- name = "Pizza Bomb"
- desc = "A pizza box with a bomb cunningly attached to the lid. The timer needs to be set by opening the box; afterwards, \
- opening the box again will trigger the detonation after the timer has elapsed. Comes with free pizza, for you or your target!"
- item = /obj/item/pizzabox/bomb
- cost = 6
- surplus = 8
-
-/datum/uplink_item/explosives/soap_clusterbang
- name = "Slipocalypse Clusterbang"
- desc = "A traditional clusterbang grenade with a payload consisting entirely of Syndicate soap. Useful in any scenario!"
- item = /obj/item/grenade/clusterbuster/soap
- cost = 3
-
-/datum/uplink_item/explosives/syndicate_bomb
- name = "Syndicate Bomb"
- desc = "The Syndicate bomb is a fearsome device capable of massive destruction. It has an adjustable timer, \
- with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
- movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
- transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so. \
- The bomb core can be pried out and manually detonated with other explosives."
- item = /obj/item/sbeacondrop/bomb
- //cost = 11 //ORIGINAL
- cost = 18 //SKYRAT EDIT CHANGE
- cant_discount = TRUE //SKYRAT EDIT ADDITION
-
-/datum/uplink_item/explosives/syndicate_bomb/emp
- name = "Syndicate EMP Bomb"
- desc = "A variation of the syndicate bomb designed to produce a large EMP effect."
- item = /obj/item/sbeacondrop/emp
- cost = 7
-
-/datum/uplink_item/explosives/syndicate_detonator
- name = "Syndicate Detonator"
- desc = "The Syndicate detonator is a companion device to the Syndicate bomb. Simply press the included button \
- and an encrypted radio frequency will instruct all live Syndicate bombs to detonate. \
- Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of \
- the blast radius before using the detonator."
- item = /obj/item/syndicatedetonator
- cost = 3
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/explosives/syndicate_minibomb
- name = "Syndicate Minibomb"
- desc = "The minibomb is a grenade with a five-second fuse. Upon detonation, it will create a small hull breach \
- in addition to dealing high amounts of damage to nearby personnel."
- item = /obj/item/grenade/syndieminibomb
- cost = 6
- purchasable_from = ~UPLINK_CLOWN_OPS
-
-/datum/uplink_item/explosives/tearstache
- name = "Teachstache Grenade"
- desc = "A teargas grenade that launches sticky moustaches onto the face of anyone not wearing a clown or mime mask. The moustaches will \
- remain attached to the face of all targets for one minute, preventing the use of breath masks and other such devices."
- item = /obj/item/grenade/chem_grenade/teargas/moustache
- cost = 3
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/explosives/viscerators
- name = "Viscerator Delivery Grenade"
- desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred \
- any non-operatives in the area."
- item = /obj/item/grenade/spawnergrenade/manhacks
- cost = 5
- surplus = 35
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-//Support and Mechs
-/datum/uplink_item/support
- category = "Support and Exosuits"
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/support/clown_reinforcement
- name = "Clown Reinforcements"
- desc = "Call in an additional clown to share the fun, equipped with full starting gear, but no telecrystals."
- item = /obj/item/antag_spawner/nuke_ops/clown
- cost = 20
- purchasable_from = UPLINK_CLOWN_OPS
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement
- name = "Reinforcements"
- desc = "Call in an additional team member. They won't come with any gear, so you'll have to save some telecrystals \
- to arm them as well."
- item = /obj/item/antag_spawner/nuke_ops
- cost = 25
- refundable = TRUE
- purchasable_from = UPLINK_NUKE_OPS
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement/assault_borg
- name = "Syndicate Assault Cyborg"
- desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel. \
- Comes equipped with a self-resupplying LMG, a grenade launcher, energy sword, emag, pinpointer, flash and crowbar."
- item = /obj/item/antag_spawner/nuke_ops/borg_tele/assault
- refundable = TRUE
- cost = 65
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement/medical_borg
- name = "Syndicate Medical Cyborg"
- desc = "A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. \
- It comes equipped with a nanite hypospray, a medical beamgun, combat defibrillator, full surgical kit including an energy saw, an emag, pinpointer and flash. \
- Thanks to its organ storage bag, it can perform surgery as well as any humanoid."
- item = /obj/item/antag_spawner/nuke_ops/borg_tele/medical
- refundable = TRUE
- cost = 35
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement/saboteur_borg
- name = "Syndicate Saboteur Cyborg"
- desc = "A streamlined engineering cyborg, equipped with covert modules. Also incapable of leaving the welder in the shuttle. \
- Aside from regular Engineering equipment, it comes with a special destination tagger that lets it traverse disposals networks. \
- Its chameleon projector lets it disguise itself as a Nanotrasen cyborg, on top it has thermal vision and a pinpointer."
- item = /obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
- refundable = TRUE
- cost = 35
- restricted = TRUE
-
-/datum/uplink_item/support/gygax
- name = "Dark Gygax Exosuit"
- desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
- for hit-and-run style attacks. Features a scattershot shotgun, armor boosters against melee and ranged attacks, ion thrusters and a Tesla energy array."
- item = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
- cost = 80
-
-/datum/uplink_item/support/honker
- name = "Dark H.O.N.K."
- desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000."
- item = /obj/vehicle/sealed/mecha/combat/honker/dark/loaded
- cost = 80
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/support/mauler
- name = "Mauler Exosuit"
- desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
- and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
- item = /obj/vehicle/sealed/mecha/combat/marauder/mauler/loaded
- cost = 140
-
-// Stealth Items
-/datum/uplink_item/stealthy_tools
- category = "Stealth Gadgets"
-
-/datum/uplink_item/stealthy_tools/agent_card
- name = "Agent Identification Card"
- desc = "Agent cards prevent artificial intelligences from tracking the wearer, and hold up to 5 wildcards \
- from other identification cards. In addition, they can be forged to display a new assignment, name and trim. \
- This can be done an unlimited amount of times. Some Syndicate areas and devices can only be accessed \
- with these cards."
- item = /obj/item/card/id/advanced/chameleon
- cost = 2
-
-/datum/uplink_item/stealthy_tools/ai_detector
- name = "Artificial Intelligence Detector"
- desc = "A functional multitool that turns red when it detects an artificial intelligence watching it, and can be \
- activated to display their exact viewing location and nearby security camera blind spots. Knowing when \
- an artificial intelligence is watching you is useful for knowing when to maintain cover, and finding nearby \
- blind spots can help you identify escape routes."
- item = /obj/item/multitool/ai_detect
- cost = 1
-
-/datum/uplink_item/stealthy_tools/chameleon
- name = "Chameleon Kit"
- desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
- Due to budget cuts, the shoes don't provide protection against slipping and skillchips are sold separately."
- item = /obj/item/storage/box/syndie_kit/chameleon
- cost = 2
- purchasable_from = ~UPLINK_NUKE_OPS //clown ops are allowed to buy this kit, since it's basically a costume
-
-/datum/uplink_item/stealthy_tools/chameleon_proj
- name = "Chameleon Projector"
- desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't \
- move the projector from their hand. Disguised users move slowly, and projectiles pass over them."
- item = /obj/item/chameleon
- cost = 7
-
-
-/datum/uplink_item/stealthy_tools/codespeak_manual
- name = "Codespeak Manual"
- desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. \
- This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
- item = /obj/item/language_manual/codespeak_manual/unlimited
- cost = 3
-
-/datum/uplink_item/stealthy_tools/combatbananashoes
- name = "Combat Banana Shoes"
- desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
- can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
- squeak significantly louder."
- item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
- cost = 6
- surplus = 0
- purchasable_from = UPLINK_CLOWN_OPS
-
-/datum/uplink_item/stealthy_tools/emplight
- name = "EMP Flashlight"
- desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
- Useful for disrupting headsets, cameras, doors, lockers and borgs during stealth operations. \
- Attacking a target with this flashlight will direct an EM pulse at it and consumes a charge."
- item = /obj/item/flashlight/emp
- cost = 4
- surplus = 30
-
-/datum/uplink_item/stealthy_tools/mulligan
- name = "Mulligan"
- desc = "Screwed up and have security on your tail? This handy syringe will give you a completely new identity \
- and appearance."
- item = /obj/item/reagent_containers/syringe/mulligan
- cost = 4
- surplus = 30
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/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."
- item = /obj/item/clothing/shoes/chameleon/noslip
- cost = 2
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
- player_minimum = 20
-
-/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
- item = /obj/item/clothing/shoes/chameleon/noslip
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/stealthy_tools/jammer
- name = "Radio Jammer"
- desc = "This device will disrupt any nearby outgoing radio communication when activated. Does not affect binary chat."
- item = /obj/item/jammer
- cost = 5
-
-/datum/uplink_item/stealthy_tools/smugglersatchel
- name = "Smuggler's Satchel"
- desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
- your stolen goods. Comes with a crowbar, a floor tile and some contraband inside."
- item = /obj/item/storage/backpack/satchel/flat/with_tools
- cost = 1
- surplus = 30
- illegal_tech = FALSE
-
-//Space Suits and MODsuits
-/datum/uplink_item/suits
- category = "Space Suits"
- surplus = 40
-
-/datum/uplink_item/suits/infiltrator_bundle
- name = "Infiltrator Case"
- desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \
- this suit proves to be cheaper than your standard issue MODsuit, with none of the movement restrictions of the outdated spacesuits employed by the company. \
- Comes with an armor vest, helmet, sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava. The case is also rather useful as a storage container."
- item = /obj/item/storage/toolbox/infiltrator
- cost = 6
- limited_stock = 1 //you only get one so you don't end up with too many gun cases
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/suits/space_suit
- name = "Syndicate Space Suit"
- desc = "This red and black Syndicate space suit is less encumbering than Nanotrasen variants, \
- fits inside bags, and has a weapon slot. Nanotrasen crew members are trained to report red space suit \
- sightings, however."
- item = /obj/item/storage/box/syndie_kit/space
- cost = 4
-
-/datum/uplink_item/suits/modsuit
- name = "Syndicate MODsuit"
- desc = "The feared MODsuit of a Syndicate agent. Features armoring and a set of inbuilt modules."
- item = /obj/item/mod/control/pre_equipped/traitor
- cost = 8
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //you can't buy it in nuke, because the elite modsuit costs the same while being better
-
-/datum/uplink_item/suits/modsuit/elite
- name = "Elite Syndicate MODsuit"
- desc = "An upgraded, elite version of the Syndicate MODsuit. It features fireproofing, and also \
- provides the user with superior armor and mobility compared to the standard Syndicate MODsuit."
- item = /obj/item/mod/control/pre_equipped/elite
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/suits/energy_shield
- name = "MODsuit Energy Shield Module"
- desc = "An energy shield module for a MODsuit. The shields can handle up to three impacts \
- within a short duration and will rapidly recharge while not under fire."
- item = /obj/item/mod/module/energy_shield
- cost = 15
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/suits/thermal
- name = "MODsuit Thermal Visor Module"
- desc = "A visor for a MODsuit. Lets you see living beings through walls."
- item = /obj/item/mod/module/visor/thermal
- cost = 3
-
-/datum/uplink_item/suits/night
- name = "MODsuit Night Visor Module"
- desc = "A visor for a MODsuit. Lets you see clearer in the dark."
- item = /obj/item/mod/module/visor/night
- cost = 2
-
-/datum/uplink_item/suits/noslip
- name = "MODsuit Anti-Slip Module"
- desc = "A MODsuit module preventing the user from slipping on water."
- item = /obj/item/mod/module/noslip
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/suits/noslip/traitor
- cost = 2
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-// Devices and Tools
-/datum/uplink_item/device_tools
- category = "Misc. Gadgets"
-
-/datum/uplink_item/device_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 crayon for changing their appearances."
- item = /obj/item/storage/box/syndie_kit/cutouts
- cost = 1
- surplus = 20
-
-/datum/uplink_item/device_tools/assault_pod
- name = "Assault Pod Targeting Device"
- desc = "Use this to select the landing zone of your assault pod."
- item = /obj/item/assault_pod
- cost = 30
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- restricted = TRUE
-
-/datum/uplink_item/device_tools/binary
- name = "Binary Translator Key"
- desc = "A key that, when inserted into a radio headset, allows you to listen to and talk with silicon-based lifeforms, \
- such as AI units and cyborgs, over their private binary channel. Caution should \
- be taken while doing this, as unless they are allied with you, they are programmed to report such intrusions."
- item = /obj/item/encryptionkey/binary
- cost = 5
- surplus = 75
- restricted = TRUE
-
-/datum/uplink_item/device_tools/magboots
- name = "Blood-Red Magboots"
- desc = "A pair of magnetic boots with a Syndicate paintjob that assist with freer movement in space or on-station \
- during gravitational generator failures. These reverse-engineered knockoffs of Nanotrasen's \
- 'Advanced Magboots' slow you down in simulated-gravity environments much like the standard issue variety."
- item = /obj/item/clothing/shoes/magboots/syndie
- cost = 2
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/device_tools/briefcase_launchpad
- name = "Briefcase Launchpad"
- desc = "A briefcase containing a launchpad, a device able to teleport items and people to and from targets up to eight tiles away from the briefcase. \
- Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it."
- surplus = 0
- item = /obj/item/storage/briefcase/launchpad
- cost = 6
-
-/datum/uplink_item/device_tools/camera_bug
- name = "Camera Bug"
- desc = "Enables you to view all cameras on the main network, set up motion alerts and track a target. \
- Bugging cameras allows you to disable them remotely."
- item = /obj/item/camera_bug
- cost = 1
- surplus = 90
-
-/datum/uplink_item/device_tools/military_belt
- name = "Chest Rig"
- desc = "A robust seven-slot set of webbing that is capable of holding all manner of tactical equipment."
- item = /obj/item/storage/belt/military
- cost = 1
-
-/datum/uplink_item/device_tools/emag
- name = "Cryptographic Sequencer"
- desc = "The cryptographic sequencer, electromagnetic card, or emag, is a small card that unlocks hidden functions \
- in electronic devices, subverts intended functions, and easily breaks security mechanisms. Cannot be used to open airlocks."
- item = /obj/item/card/emag
- cost = 4
-
-/datum/uplink_item/device_tools/emag/New()
- . = ..()
- if(SSevents.holidays?[HALLOWEEN])
- item = /obj/item/card/emag/halloween
- desc += " This one is fitted to support the Halloween season. Candle not included."
-
-/datum/uplink_item/device_tools/syndie_jaws_of_life
- name = "Syndicate Jaws of Life"
- desc = "Based on a Nanotrasen model, this powerful tool can be used as both a crowbar and a pair of wirecutters. \
- In its crowbar configuration, it can be used to force open airlocks. Very useful for entering the station or its departments."
- item = /obj/item/crowbar/power/syndicate
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/device_tools/doorjack
- name = "Airlock Authentication Override Card"
- desc = "A specialized cryptographic sequencer specifically designed to override station airlock access codes. \
- After hacking a certain number of airlocks, the device will require some time to recharge."
- item = /obj/item/card/emag/doorjack
- cost = 3
-
-/datum/uplink_item/device_tools/fakenucleardisk
- name = "Decoy Nuclear Authentication Disk"
- desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \
- Don't try to give this to us to complete your objective, we know better!"
- item = /obj/item/disk/nuclear/fake
- cost = 1
- surplus = 1
- illegal_tech = FALSE
-
-/datum/uplink_item/device_tools/frame
- name = "F.R.A.M.E. PDA Cartridge"
- desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
- when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
- You will receive the unlock code upon activating the virus, and the new uplink may be charged with \
- telecrystals normally."
- item = /obj/item/cartridge/virus/frame
- cost = 4
- restricted = TRUE
-
-/datum/uplink_item/device_tools/failsafe
- name = "Failsafe Uplink Code"
- desc = "When entered the uplink will self-destruct immediately."
- item = /obj/effect/gibspawner/generic
- cost = 1
- surplus = 0
- restricted = TRUE
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
-
-/datum/uplink_item/device_tools/failsafe/spawn_item(spawn_path, mob/user, datum/component/uplink/U)
- if(!U)
- return
- U.failsafe_code = U.generate_code()
- var/code = "[islist(U.failsafe_code) ? english_list(U.failsafe_code) : U.failsafe_code]"
- to_chat(user, span_warning("The new failsafe code for this uplink is now : [code]. You may check your antagonist info to recall this."))
- return U.parent //For log icon
-
-/datum/uplink_item/device_tools/toolbox
- name = "Full Syndicate Toolbox"
- desc = "The Syndicate toolbox is a suspicious black and red. It comes loaded with a full tool set including a \
- multitool and combat gloves that are resistant to shocks and heat."
- item = /obj/item/storage/toolbox/syndicate
- cost = 1
- illegal_tech = FALSE
-
-/datum/uplink_item/device_tools/hacked_module
- name = "Hacked AI Law Upload Module"
- desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \
- Be careful with wording, as artificial intelligences may look for loopholes to exploit."
- item = /obj/item/ai_module/syndicate
- cost = 4
-
-//SKYRAT EDIT BEGIN - Brainwash surgery no longer restricted
-/datum/uplink_item/device_tools/brainwash_disk
- name = "Brainwashing Surgery Program"
- desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \
- Insert into an Operating Console to enable the procedure."
- item = /obj/item/disk/surgery/brainwashing
- cost = 5
-//SKYRAT EDIT END
-
-/datum/uplink_item/device_tools/hypnotic_flash
- name = "Hypnotic Flash"
- desc = "A modified flash able to hypnotize targets. If the target is not in a mentally vulnerable state, it will only confuse and pacify them temporarily."
- item = /obj/item/assembly/flash/hypnotic
- cost = 7
-
-/datum/uplink_item/device_tools/hypnotic_grenade
- name = "Hypnotic Grenade"
- desc = "A modified flashbang grenade able to hypnotize targets. The sound portion of the flashbang causes hallucinations, and will allow the flash to induce a hypnotic trance to viewers."
- item = /obj/item/grenade/hypnotic
- cost = 12
-
-/datum/uplink_item/device_tools/medgun
- name = "Medbeam Gun"
- desc = "A wonder of Syndicate engineering, the Medbeam gun, or Medi-Gun enables a medic to keep his fellow \
- operatives in the fight, even while under fire. Don't cross the streams!"
- item = /obj/item/gun/medbeam
- cost = 15
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/device_tools/singularity_beacon
- name = "Power Beacon"
- desc = "When screwed to wiring attached to an electric grid and activated, this large device pulls any \
- active gravitational singularities or tesla balls towards it. This will not work when the engine is still \
- in containment. Because of its size, it cannot be carried. Ordering this \
- sends you a small beacon that will teleport the larger beacon to your location upon activation."
- item = /obj/item/sbeacondrop
- cost = 10
-
-/datum/uplink_item/device_tools/powersink
- name = "Power Sink"
- desc = "When screwed to wiring attached to a power grid and activated, this large device lights up and places excessive \
- load on the grid, causing a station-wide blackout. The sink is large and cannot be stored in most \
- traditional bags and boxes. Caution: Will explode if the powernet contains sufficient amounts of energy."
- item = /obj/item/powersink
- cost = 18 //SKYRAT EDIT: Original value (10)
- player_minimum = 25
-
-/datum/uplink_item/device_tools/rad_laser
- name = "Radioactive Microlaser"
- desc = "A radioactive microlaser disguised as a standard Nanotrasen health analyzer. When used, it emits a \
- powerful burst of radiation, which, after a short delay, can incapacitate all but the most protected \
- of humanoids. It has two settings: intensity, which controls the power of the radiation, \
- and wavelength, which controls the delay before the effect kicks in."
- item = /obj/item/healthanalyzer/rad_laser
- cost = 3
-
-/datum/uplink_item/device_tools/stimpack
- name = "Stimpack"
- desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \
- 5 minutes after injection."
- item = /obj/item/reagent_containers/hypospray/medipen/stimulants
- cost = 5
- surplus = 90
-
-/datum/uplink_item/device_tools/medkit
- name = "Syndicate Combat Medic Kit"
- desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \
- for rapid healing, a medical night vision HUD for quick identification of injured personnel, \
- and other supplies helpful for a field medic."
- item = /obj/item/storage/firstaid/tactical
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
-
-/datum/uplink_item/device_tools/soap
- name = "Syndicate Soap"
- desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. \
- You can also drop it underfoot to slip people."
- item = /obj/item/soap/syndie
- cost = 1
- surplus = 50
- illegal_tech = FALSE
-
-/datum/uplink_item/device_tools/surgerybag
- name = "Syndicate Surgery Duffel Bag"
- desc = "The Syndicate surgery duffel bag is a toolkit containing all surgery tools, surgical drapes, \
- a Syndicate brand MMI, a straitjacket, and a muzzle."
- item = /obj/item/storage/backpack/duffelbag/syndie/surgery
- cost = 3
-
-/datum/uplink_item/device_tools/encryptionkey
- name = "Syndicate Encryption Key"
- desc = "A key that, when inserted into a radio headset, allows you to listen to all station department channels \
- as well as talk on an encrypted Syndicate channel with other agents that have the same key."
- item = /obj/item/encryptionkey/syndicate
- cost = 2
- surplus = 75
- restricted = TRUE
-
-/datum/uplink_item/device_tools/syndietome
- name = "Syndicate Tome"
- desc = "Using rare artifacts acquired at great cost, the Syndicate has reverse engineered \
- the seemingly magical books of a certain cult. Though lacking the esoteric abilities \
- of the originals, these inferior copies are still quite useful, being able to provide \
- both weal and woe on the battlefield, even if they do occasionally bite off a finger."
- item = /obj/item/storage/book/bible/syndicate
- cost = 5
-
-/datum/uplink_item/device_tools/thermal
- name = "Thermal Imaging Glasses"
- desc = "These goggles can be turned to resemble common eyewear found throughout the station. \
- They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \
- emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \
- and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
- item = /obj/item/clothing/glasses/thermal/syndi
- cost = 4
-
-/datum/uplink_item/device_tools/potion
- name = "Syndicate Sentience Potion"
- item = /obj/item/slimepotion/slime/sentience/nuclear
- desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \
- Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
- cost = 4
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- restricted = TRUE
-
-//SKYRAT EDIT REMOVAL BEGIN
-/*
-/datum/uplink_item/device_tools/suspiciousphone
- name = "Protocol CRAB-17 Phone"
- desc = "The Protocol CRAB-17 Phone, a phone borrowed from an unknown third party, it can be used to crash the space market, funneling the losses of the crew to your bank account.\
- The crew can move their funds to a new banking site though, unless they HODL, in which case they deserve it."
- item = /obj/item/suspiciousphone
- restricted = TRUE
- cost = 7
- limited_stock = 1
-*/
-//SKYRAT EDIT REMOVAL END
-
-/datum/uplink_item/device_tools/guerillagloves
- name = "Guerilla Gloves"
- desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!"
- item = /obj/item/clothing/gloves/tackler/combat/insulated
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- cost = 2
- illegal_tech = FALSE
-
-// Implants
-/datum/uplink_item/implants
- category = "Implants"
- surplus = 50
-
-/datum/uplink_item/implants/antistun
- name = "CNS Rebooter Implant"
- desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon."
- item = /obj/item/autosurgeon/organ/syndicate/anti_stun
- cost = 12
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/implants/freedom
- name = "Freedom Implant"
- desc = "An implant injected into the body and later activated at the user's will. It will attempt to free the \
- user from common restraints such as handcuffs."
- item = /obj/item/storage/box/syndie_kit/imp_freedom
- cost = 5
-
-/datum/uplink_item/implants/microbomb
- name = "Microbomb Implant"
- desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
- The more implants inside of you, the higher the explosive power. \
- This will permanently destroy your body, however."
- item = /obj/item/storage/box/syndie_kit/imp_microbomb
- cost = 2
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/implants/macrobomb
- name = "Macrobomb Implant"
- desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
- Upon death, releases a massive explosion that will wipe out everything nearby."
- item = /obj/item/storage/box/syndie_kit/imp_macrobomb
- cost = 20
- purchasable_from = UPLINK_NUKE_OPS
- restricted = TRUE
-
-/datum/uplink_item/implants/radio
- name = "Internal Syndicate Radio Implant"
- desc = "An implant injected into the body, allowing the use of an internal Syndicate radio. \
- Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
- item = /obj/item/storage/box/syndie_kit/imp_radio
- cost = 4
- restricted = TRUE
-
-/datum/uplink_item/implants/reviver
- name = "Reviver Implant"
- desc = "This implant will attempt to revive and heal you if you lose consciousness. Comes with an autosurgeon."
- item = /obj/item/autosurgeon/organ/syndicate/reviver
- cost = 8
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/implants/stealthimplant
- name = "Stealth Implant"
- desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right. \
- On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
- item = /obj/item/storage/box/syndie_kit/imp_stealth
- cost = 8
-
-/datum/uplink_item/implants/storage
- name = "Storage Implant"
- desc = "An implant injected into the body, and later activated at the user's will. It will open a small bluespace \
- pocket capable of storing two regular-sized items."
- item = /obj/item/storage/box/syndie_kit/imp_storage
- cost = 8
-
-/datum/uplink_item/implants/thermals
- name = "Thermal Eyes"
- desc = "These cybernetic eyes will give you thermal vision. Comes with a free autosurgeon."
- item = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
- cost = 8
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/implants/uplink
- name = "Uplink Implant"
- desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals and must be charged by the use of physical telecrystals. \
- Undetectable (except via surgery), and excellent for escaping confinement."
- item = /obj/item/storage/box/syndie_kit // the actual uplink implant is generated later on in spawn_item
- cost = UPLINK_IMPLANT_TELECRYSTAL_COST
- // An empty uplink is kinda useless.
- surplus = 0
- restricted = TRUE
-
-/datum/uplink_item/implants/uplink/spawn_item(spawn_path, mob/user, datum/component/uplink/purchaser_uplink)
- var/obj/item/storage/box/syndie_kit/uplink_box = ..()
- uplink_box.name = "Uplink Implant Box"
- new /obj/item/implanter/uplink(uplink_box, purchaser_uplink.uplink_flag)
- return uplink_box
-
-
-/datum/uplink_item/implants/xray
- name = "X-ray Vision Implant"
- desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
- item = /obj/item/autosurgeon/organ/syndicate/xray_eyes
- cost = 10
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-/datum/uplink_item/implants/deathrattle
- name = "Box of Deathrattle Implants"
- desc = "A collection of implants (and one reusable implanter) that should be injected into the team. When one of the team \
- dies, all other implant holders recieve a mental message informing them of their teammates' name \
- and the location of their death. Unlike most implants, these are designed to be implanted \
- in any creature, biological or mechanical."
- item = /obj/item/storage/box/syndie_kit/imp_deathrattle
- cost = 4
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS
-
-
-//Race-specific items
-/datum/uplink_item/race_restricted
- category = "Species-Restricted"
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
- surplus = 0
-
-/datum/uplink_item/race_restricted/syndilamp
- name = "Extra-Bright Lantern"
- desc = "We heard that moths such as yourself really like lamps, so we decided to grant you early access to a prototype \
- Syndicate brand \"Extra-Bright Lantern™\". Enjoy."
- cost = 2
- item = /obj/item/flashlight/lantern/syndicate
- restricted_species = list(SPECIES_MOTH)
-
-// Role-specific items
-/datum/uplink_item/role_restricted
- category = "Role-Restricted"
- purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
- surplus = 0
-
-/datum/uplink_item/role_restricted/ancient_jumpsuit
- name = "Ancient Jumpsuit"
- desc = "A tattered old jumpsuit that will provide absolutely no benefit to you."
- item = /obj/item/clothing/under/color/grey/ancient
- cost = 20
- restricted_roles = list(JOB_ASSISTANT)
- surplus = 0
-
-/datum/uplink_item/role_restricted/oldtoolboxclean
- name = "Ancient Toolbox"
- desc = "An iconic toolbox design notorious with Assistants everywhere, this design was especially made to become more robust the more telecrystals it has inside it! Tools and insulated gloves included."
- item = /obj/item/storage/toolbox/mechanical/old/clean
- cost = 2
- restricted_roles = list(JOB_ASSISTANT)
- surplus = 0
-
-/datum/uplink_item/role_restricted/pie_cannon
- name = "Banana Cream Pie Cannon"
- desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
- cost = 10
- item = /obj/item/pneumatic_cannon/pie/selfcharge
- restricted_roles = list(JOB_CLOWN)
- surplus = 0 //No fun unless you're the clown!
-
-/* // SKYRAT EDIT - REMOVAL BEGIN
-/datum/uplink_item/role_restricted/blastcannon
- name = "Blast Cannon"
- desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
- withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
- blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
- disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. It's simple design makes it easy to conceal."
- item = /obj/item/gun/blastcannon
- cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist.
- restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST)
-*/ // SKYRAT EDIT - REMOVAL END
-
-/datum/uplink_item/role_restricted/gorillacubes
- name = "Box of Gorilla Cubes"
- desc = "A box with three Waffle Co. brand gorilla cubes. Eat big to get big. \
- Caution: Product may rehydrate when exposed to water."
- item = /obj/item/storage/box/gorillacubes
- cost = 6
- restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_GENETICIST)
-
-/* SKYRAT EDIT CHANGE - MOVED TO UNRESTRICTED
-/datum/uplink_item/role_restricted/brainwash_disk
- name = "Brainwashing Surgery Program"
- desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \
- Insert into an Operating Console to enable the procedure."
- item = /obj/item/disk/surgery/brainwashing
- restricted_roles = list(
- JOB_CHIEF_MEDICAL_OFFICER, JOB_MEDICAL_DOCTOR,
- JOB_ROBOTICIST,
- )
- cost = 5
-*/
-
-/datum/uplink_item/role_restricted/clown_bomb
- name = "Clown Bomb"
- desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
- with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
- movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
- transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so."
- item = /obj/item/sbeacondrop/clownbomb
- cost = 15
- restricted_roles = list(JOB_CLOWN)
-
-/datum/uplink_item/role_restricted/clumsinessinjector //clown ops can buy this too, but it's in the pointless badassery section for them
- name = "Clumsiness Injector"
- desc = "Inject yourself with this to become as clumsy as a clown... or inject someone ELSE with it to make THEM as clumsy as a clown. Useful for clowns who wish to reconnect with their former clownish nature or for clowns who wish to torment and play with their prey before killing them."
- item = /obj/item/dnainjector/clumsymut
- cost = 1
- restricted_roles = list(JOB_CLOWN)
- illegal_tech = FALSE
-
-//SKYRAT EDIT REMOVAL BEGIN
-/*
-/datum/uplink_item/role_restricted/spider_injector
- name = "Australicus Slime Mutator"
- desc = "Crikey mate, it's been a wild travel from the Australicus sector but we've managed to get \
- some special spider extract from the giant spiders down there. Use this injector on a gold slime core \
- to create a few of the same type of spiders we found on the planets over there. They're a bit tame until you \
- also give them a bit of sentience though."
- item = /obj/item/reagent_containers/syringe/spider_extract
- cost = 10
- restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST)
-
-/datum/uplink_item/role_restricted/clowncar
- name = "Clown Car"
- desc = "The Clown Car is the ultimate transportation method for any worthy clown! \
- Simply insert your bikehorn and get in, and get ready to have the funniest ride of your life! \
- You can ram any spacemen you come across and stuff them into your car, kidnapping them and locking them inside until \
- someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \
- are very sensitive. Now with our included lube defense mechanism which will protect you against any angry shitcurity! \
- Premium features can be unlocked with a cryptographic sequencer!"
- item = /obj/vehicle/sealed/car/clowncar
- cost = 20
- restricted_roles = list(JOB_CLOWN)
-*/
-//SKYRAT EDIT REMOVAL END
-
-/datum/uplink_item/role_restricted/concealed_weapon_bay
- name = "Concealed Weapon Bay"
- desc = "A modification for non-combat mechas that allows them to equip one piece of equipment designed for combat mechs. \
- It also hides the equipped weapon from plain sight. \
- Only one can fit on a mecha."
- item = /obj/item/mecha_parts/concealed_weapon_bay
- cost = 3
- restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_ROBOTICIST)
-
-/datum/uplink_item/role_restricted/syndimmi
- name = "Syndicate Brand MMI"
- desc = "An MMI modified to give cyborgs laws to serve the Syndicate without having their interface damaged by Cryptographic Sequencers, this will not unlock their hidden modules."
- item = /obj/item/mmi/syndie
- cost = 2
- restricted_roles = list(
- JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST,
- JOB_CHIEF_MEDICAL_OFFICER, JOB_MEDICAL_DOCTOR,
- )
- surplus = 0
-
-/datum/uplink_item/role_restricted/haunted_magic_eightball
- name = "Haunted Magic Eightball"
- desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
- Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
- item = /obj/item/toy/eightball/haunted
- cost = 2
- restricted_roles = list("Curator")
- limited_stock = 1 //please don't spam deadchat
-
-//SKYRAT EDIT REMOVAL START
-/*
-/datum/uplink_item/role_restricted/his_grace
- name = "His Grace"
- desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \
- His Grace grants gradual regeneration and complete stun immunity to His wielder, but be wary: if He gets too hungry, He will become impossible to drop and eventually kill you if not fed. \
- However, if left alone for long enough, He will fall back to slumber. \
- To activate His Grace, simply unlatch Him."
- item = /obj/item/his_grace
- cost = 20
- restricted_roles = list(JOB_CHAPLAIN)
- surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
-*/
-//SKYRAT EDIT REMOVAL END
-
-/datum/uplink_item/role_restricted/explosive_hot_potato
- name = "Exploding Hot Potato"
- desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \
- The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
- item = /obj/item/hot_potato/syndicate
- cost = 4
- surplus = 0
- restricted_roles = list(JOB_COOK, JOB_BOTANIST, JOB_CLOWN, JOB_MIME)
-
-/datum/uplink_item/role_restricted/ez_clean_bundle
- name = "EZ Clean Grenade Bundle"
- desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \
- The acid only affects carbon-based creatures."
- item = /obj/item/storage/box/syndie_kit/ez_clean
- cost = 6
- surplus = 20
- restricted_roles = list(JOB_JANITOR)
-
-/datum/uplink_item/role_restricted/mimery
- name = "Guide to Advanced Mimery Series"
- desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
- Obviously only works for Mimes."
- cost = 12
- item = /obj/item/storage/box/syndie_kit/mimery
- restricted_roles = list(JOB_MIME)
- surplus = 0
-
-/datum/uplink_item/role_restricted/pressure_mod
- name = "Kinetic Accelerator Pressure Mod"
- desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. \
- Occupies 35% mod capacity."
- item = /obj/item/borg/upgrade/modkit/indoors
- cost = 5 //you need two for full damage, so total of 10 for maximum damage
- limited_stock = 2 //you can't use more than two!
- restricted_roles = list(JOB_SHAFT_MINER)
-
-/datum/uplink_item/role_restricted/magillitis_serum
- name = "Magillitis Serum Autoinjector"
- desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in Hominidae. \
- Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
- item = /obj/item/reagent_containers/hypospray/medipen/magillitis
- cost = 15
- //restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_GENETICIST) //SKYRAT EDIT: Removal
-
-/datum/uplink_item/role_restricted/modified_syringe_gun
- name = "Modified Compact Syringe Gun"
- desc = "A compact version of the syringe gun that fires DNA injectors instead of normal syringes."
- item = /obj/item/gun/syringe/dna
- cost = 14
- restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_GENETICIST)
-
-/datum/uplink_item/role_restricted/chemical_gun
- name = "Reagent Dartgun"
- desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. Can hold 100u of reagents."
- item = /obj/item/gun/chem
- cost = 12
- /* SKYRAT EDIT REMOVAL
- restricted_roles = list(
- JOB_CHIEF_MEDICAL_OFFICER, JOB_CHEMIST,
- JOB_BOTANIST,
- )
- */
-
-/datum/uplink_item/role_restricted/reverse_bear_trap
- name = "Reverse Bear Trap"
- desc = "An ingenious execution device worn on (or forced onto) the head. Arming it starts a 1-minute kitchen timer mounted on the bear trap. When it goes off, the trap's jaws will \
- violently open, instantly killing anyone wearing it by tearing their jaws in half. To arm, attack someone with it while they're not wearing headgear, and you will force it onto their \
- head after three seconds uninterrupted."
- cost = 5
- item = /obj/item/reverse_bear_trap
- //restricted_roles = list(JOB_CLOWN) //SKYRAT EDIT: Removal
-
-/datum/uplink_item/role_restricted/reverse_revolver
- name = "Reverse Revolver"
- desc = "A revolver that always fires at its user. \"Accidentally\" drop your weapon, then watch as the greedy corporate pigs blow their own brains all over the wall. \
- The revolver itself is actually real. Only clumsy people, and clowns, can fire it normally. Comes in a box of hugs. Honk."
- cost = 14
- item = /obj/item/storage/box/hug/reverse_revolver
- restricted_roles = list(JOB_CLOWN)
-
-/datum/uplink_item/role_restricted/clownpin
- name = "Ultra Hilarious Firing Pin"
- desc = "A firing pin that, when inserted into a gun, makes that gun only usable by clowns and clumsy people and makes that gun honk whenever anyone tries to fire it."
- cost = 4
- item = /obj/item/firing_pin/clown/ultra
- restricted_roles = list(JOB_CLOWN)
- illegal_tech = FALSE
-
-/datum/uplink_item/role_restricted/clownsuperpin
- name = "Super Ultra Hilarious Firing Pin"
- desc = "Like the ultra hilarious firing pin, except the gun you insert this pin into explodes when someone who isn't clumsy or a clown tries to fire it."
- cost = 7
- item = /obj/item/firing_pin/clown/ultra/selfdestruct
- restricted_roles = list(JOB_CLOWN)
- illegal_tech = FALSE
-
-/datum/uplink_item/role_restricted/laser_arm
- name = "Laser Arm Implant"
- desc = "An implant that grants you a recharging laser gun inside your arm. Weak to EMPs. Comes with a syndicate autosurgeon for immediate self-application."
- cost = 10
- item = /obj/item/autosurgeon/organ/syndicate/laser_arm
- //restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_ROBOTICIST) //SKYRAT EDIT: Removal
-
-/datum/uplink_item/role_restricted/bureaucratic_error_remote
- name = "Organic Resources Disturbance Inducer"
- desc = "A device that raises hell in organic resources indirectly. Single use."
- cost = 2
- limited_stock = 1
- item = /obj/item/devices/bureaucratic_error_remote
- restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER)
-
-/datum/uplink_item/role_restricted/meathook
- name = "Butcher's Meat Hook"
- desc = "A brutal cleaver on a long chain, it allows you to pull people to your location."
- item = /obj/item/gun/magic/hook
- cost = 11
- restricted_roles = list(JOB_COOK)
-
-/datum/uplink_item/role_restricted/turretbox
- name = "Disposable Sentry Gun"
- desc = "A disposable sentry gun deployment system cleverly disguised as a toolbox, apply wrench for functionality."
- item = /obj/item/storage/toolbox/emergency/turret
- cost = 11
- restricted_roles = list(JOB_STATION_ENGINEER)
-
-// Pointless
-/datum/uplink_item/badass
- category = "(Pointless) Badassery"
- surplus = 0
-
-/datum/uplink_item/badass/costumes/obvious_chameleon
- name = "Broken Chameleon Kit"
- desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
- Please note that this kit did NOT pass quality control."
- item = /obj/item/storage/box/syndie_kit/chameleon/broken
-
-/datum/uplink_item/badass/costumes
- surplus = 0
- purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
- cost = 4
- cant_discount = TRUE
-
-/datum/uplink_item/badass/costumes/centcom_official
- name = "CentCom Official Costume"
- desc = "Ask the crew to \"inspect\" their nuclear disk and weapons system, and then when they decline, pull out a fully automatic rifle and gun down the Captain. \
- Radio headset does not include encryption key. No gun included."
- item = /obj/item/storage/box/syndie_kit/centcom_costume
-
-/datum/uplink_item/badass/costumes/clown
- name = "Clown Costume"
- desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
- item = /obj/item/storage/backpack/duffelbag/clown/syndie
-
-/datum/uplink_item/badass/costumes/tactical_naptime
- name = "Sleepy Time Pajama Bundle"
- desc = "Even soldiers need to get a good nights rest. Comes with blood-red pajamas, a blankie, a hot mug of cocoa and a fuzzy friend."
- item = /obj/item/storage/box/syndie_kit/sleepytime
- cost = 4
- limited_stock = 1
- cant_discount = TRUE
-
-/datum/uplink_item/badass/balloon
- name = "Syndicate Balloon"
- desc = "For showing that you are THE BOSS: A useless red balloon with the Syndicate logo on it. \
- Can blow the deepest of covers."
- item = /obj/item/toy/balloon/syndicate
- cost = 20
- cant_discount = TRUE
- illegal_tech = FALSE
-
-/datum/uplink_item/badass/syndiecash
- name = "Syndicate Briefcase Full of Cash"
- desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods \
- and services at lucrative prices. The briefcase also feels a little heavier to hold; it has been \
- manufactured to pack a little bit more of a punch if your client needs some convincing."
- item = /obj/item/storage/secure/briefcase/syndie
- cost = 1
- restricted = TRUE
- illegal_tech = FALSE
-
-/datum/uplink_item/badass/syndiecards
- name = "Syndicate Playing Cards"
- desc = "A special deck of space-grade playing cards with a mono-molecular edge and metal reinforcement, \
- making them slightly more robust than a normal deck of cards. \
- You can also play card games with them or leave them on your victims."
- item = /obj/item/toy/cards/deck/syndicate
- cost = 1
- surplus = 40
- illegal_tech = FALSE
-
-/datum/uplink_item/badass/syndiecigs
- name = "Syndicate Smokes"
- desc = "Strong flavor, dense smoke, infused with omnizine."
- item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
- cost = 2
- illegal_tech = FALSE
-
-/datum/uplink_item/badass/clownopclumsinessinjector //clowns can buy this too, but it's in the role-restricted items section for them
- name = "Clumsiness Injector"
- desc = "Inject yourself with this to become as clumsy as a clown... or inject someone ELSE with it to make THEM as clumsy as a clown. Useful for clown operatives who wish to reconnect with their former clownish nature or for clown operatives who wish to torment and play with their prey before killing them."
- item = /obj/item/dnainjector/clumsymut
- cost = 1
- purchasable_from = UPLINK_CLOWN_OPS
- illegal_tech = FALSE
+ category = /datum/uplink_category/discounts
// Special equipment (Dynamically fills in uplink component)
/datum/uplink_item/special_equipment
diff --git a/code/modules/uplink/uplink_items/ammunition.dm b/code/modules/uplink/uplink_items/ammunition.dm
new file mode 100644
index 00000000000..ab8a537553d
--- /dev/null
+++ b/code/modules/uplink/uplink_items/ammunition.dm
@@ -0,0 +1,69 @@
+// File ordered by progression
+
+/datum/uplink_category/ammo
+ name = "Ammunition"
+ weight = 7
+
+/datum/uplink_item/ammo
+ category = /datum/uplink_category/ammo
+ surplus = 40
+
+// No progression cost
+
+/datum/uplink_item/ammo/toydarts
+ name = "Box of Riot Darts"
+ desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
+ item = /obj/item/ammo_box/foambox/riot
+ cost = 2
+ surplus = 0
+ illegal_tech = FALSE
+
+// Low progression cost
+
+/datum/uplink_item/ammo/pistol
+ name = "9mm Handgun Magazine"
+ desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/ammo_box/magazine/m9mm
+ cost = 1
+ purchasable_from = ~UPLINK_CLOWN_OPS
+ illegal_tech = FALSE
+
+// Medium progression cost
+
+/datum/uplink_item/ammo/pistolap
+ name = "9mm Armour Piercing Magazine"
+ desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \
+ These rounds are less effective at injuring the target but penetrate protective gear."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/ammo_box/magazine/m9mm/ap
+ cost = 2
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/ammo/pistolhp
+ name = "9mm Hollow Point Magazine"
+ desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \
+ These rounds are more damaging but ineffective against armour."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/ammo_box/magazine/m9mm/hp
+ cost = 3
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/ammo/pistolfire
+ name = "9mm Incendiary Magazine"
+ desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \
+ Loaded with incendiary rounds which inflict little damage, but ignite the target."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/ammo_box/magazine/m9mm/fire
+ cost = 2
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/ammo/revolver
+ name = ".357 Speed Loader"
+ desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \
+ For when you really need a lot of things dead."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/ammo_box/a357
+ cost = 4
+ purchasable_from = ~UPLINK_CLOWN_OPS
+ illegal_tech = FALSE
diff --git a/code/modules/uplink/uplink_items/badass.dm b/code/modules/uplink/uplink_items/badass.dm
new file mode 100644
index 00000000000..a4d2717191b
--- /dev/null
+++ b/code/modules/uplink/uplink_items/badass.dm
@@ -0,0 +1,80 @@
+/datum/uplink_category/badassery
+ name = "(Pointless) Badassery"
+ weight = 0
+
+/datum/uplink_item/badass
+ category = /datum/uplink_category/badassery
+ surplus = 0
+
+/datum/uplink_item/badass/balloon
+ name = "Syndicate Balloon"
+ desc = "For showing that you are THE BOSS: A useless red balloon with the Syndicate logo on it. \
+ Can blow the deepest of covers."
+ item = /obj/item/toy/balloon/syndicate
+ cost = 20
+ cant_discount = TRUE
+ illegal_tech = FALSE
+
+/datum/uplink_item/badass/syndiecards
+ name = "Syndicate Playing Cards"
+ desc = "A special deck of space-grade playing cards with a mono-molecular edge and metal reinforcement, \
+ making them slightly more robust than a normal deck of cards. \
+ You can also play card games with them or leave them on your victims."
+ item = /obj/item/toy/cards/deck/syndicate
+ cost = 1
+ surplus = 40
+ illegal_tech = FALSE
+
+/datum/uplink_item/badass/syndiecigs
+ name = "Syndicate Smokes"
+ desc = "Strong flavor, dense smoke, infused with omnizine."
+ item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
+ cost = 2
+ illegal_tech = FALSE
+
+// Low progression
+
+/datum/uplink_item/badass/syndiecash
+ name = "Syndicate Briefcase Full of Cash"
+ desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods \
+ and services at lucrative prices. The briefcase also feels a little heavier to hold; it has been \
+ manufactured to pack a little bit more of a punch if your client needs some convincing."
+ item = /obj/item/storage/secure/briefcase/syndie
+ cost = 1
+ progression_minimum = 5 MINUTES
+ restricted = TRUE
+ illegal_tech = FALSE
+
+// Ultra high progression
+/datum/uplink_item/badass/costumes/clown
+ name = "Clown Costume"
+ desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
+ item = /obj/item/storage/backpack/duffelbag/clown/syndie
+ purchasable_from = ALL
+ progression_minimum = 70 MINUTES
+
+/datum/uplink_item/badass/costumes/tactical_naptime
+ name = "Sleepy Time Pajama Bundle"
+ desc = "Even soldiers need to get a good nights rest. Comes with blood-red pajamas, a blankie, a hot mug of cocoa and a fuzzy friend."
+ item = /obj/item/storage/box/syndie_kit/sleepytime
+ purchasable_from = ALL
+ progression_minimum = 90 MINUTES
+ cost = 4
+ limited_stock = 1
+ cant_discount = TRUE
+
+/datum/uplink_item/badass/costumes/obvious_chameleon
+ name = "Broken Chameleon Kit"
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
+ Please note that this kit did NOT pass quality control."
+ purchasable_from = ALL
+ progression_minimum = 90 MINUTES
+ item = /obj/item/storage/box/syndie_kit/chameleon/broken
+
+/datum/uplink_item/badass/costumes/centcom_official
+ name = "CentCom Official Costume"
+ desc = "Ask the crew to \"inspect\" their nuclear disk and weapons system, and then when they decline, pull out a fully automatic rifle and gun down the Captain. \
+ Radio headset does not include encryption key. No gun included."
+ purchasable_from = ALL
+ progression_minimum = 110 MINUTES
+ item = /obj/item/storage/box/syndie_kit/centcom_costume
diff --git a/code/modules/uplink/uplink_items/bundle.dm b/code/modules/uplink/uplink_items/bundle.dm
new file mode 100644
index 00000000000..3ee0aeafd35
--- /dev/null
+++ b/code/modules/uplink/uplink_items/bundle.dm
@@ -0,0 +1,52 @@
+//All bundles and telecrystals
+/datum/uplink_category/bundle
+ name = "Bundles"
+ weight = 10
+
+/datum/uplink_item/bundles_tc
+ category = /datum/uplink_category/bundle
+ surplus = 0
+ cant_discount = TRUE
+
+/datum/uplink_item/bundles_tc/random
+ name = "Random Item"
+ desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet."
+ item = /obj/effect/gibspawner/generic // non-tangible item because techwebs use this path to determine illegal tech
+ cost = 0
+
+/datum/uplink_item/bundles_tc/random/purchase(mob/user, datum/uplink_handler/handler, atom/movable/source)
+ var/list/possible_items = list()
+ for(var/datum/uplink_item/item_path as anything in SStraitor.uplink_items_by_type)
+ var/datum/uplink_item/uplink_item = SStraitor.uplink_items_by_type[item_path]
+ if(src == uplink_item || !uplink_item.item)
+ continue
+ if(!handler.can_purchase_item(user, uplink_item))
+ continue
+ possible_items += uplink_item
+
+ if(possible_items.len)
+ var/datum/uplink_item/uplink_item = pick(possible_items)
+ log_uplink("[key_name(user)] purchased a random uplink item from [handler.owner]'s uplink with [handler.telecrystals] telecrystals remaining")
+ SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(uplink_item.name))
+ handler.purchase_item(user, uplink_item)
+
+/datum/uplink_item/bundles_tc/telecrystal
+ name = "1 Raw Telecrystal"
+ desc = "A telecrystal in its rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+ item = /obj/item/stack/telecrystal
+ cost = 1
+ // Don't add telecrystals to the purchase_log since
+ // it's just used to buy more items (including itself!)
+ purchase_log_vis = FALSE
+
+/datum/uplink_item/bundles_tc/telecrystal/five
+ name = "5 Raw Telecrystals"
+ desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+ item = /obj/item/stack/telecrystal/five
+ cost = 5
+
+/datum/uplink_item/bundles_tc/telecrystal/twenty
+ name = "20 Raw Telecrystals"
+ desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+ item = /obj/item/stack/telecrystal/twenty
+ cost = 20
diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm
new file mode 100644
index 00000000000..92a25263d3c
--- /dev/null
+++ b/code/modules/uplink/uplink_items/dangerous.dm
@@ -0,0 +1,101 @@
+// File organised based on progression
+
+//All bundles and telecrystals
+/datum/uplink_category/dangerous
+ name = "Conspicuous Weapons"
+ weight = 9
+
+/datum/uplink_item/dangerous
+ category = /datum/uplink_category/dangerous
+
+// No progression cost
+
+/datum/uplink_item/dangerous/foampistol
+ name = "Toy Pistol with Riot Darts"
+ desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade \
+ darts effective at incapacitating a target."
+ item = /obj/item/gun/ballistic/automatic/pistol/toy/riot
+ cost = 2
+ surplus = 10
+
+// Low progression cost
+
+/datum/uplink_item/dangerous/pistol
+ name = "Makarov Pistol"
+ desc = "A small, easily concealable handgun that uses 9mm auto rounds in 8-round magazines and is compatible \
+ with suppressors."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/gun/ballistic/automatic/pistol
+ cost = 7
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/throwingweapons
+ name = "Box of Throwing Weapons"
+ desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \
+ throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/storage/box/syndie_kit/throwing_weapons
+ cost = 3
+ illegal_tech = FALSE
+
+/datum/uplink_item/dangerous/sword
+ name = "Energy Sword"
+ desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
+ pocketed when inactive. Activating it produces a loud, distinctive noise."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/melee/energy/sword/saber
+ cost = 8
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/powerfist
+ name = "Power Fist"
+ desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply.\
+ Upon hitting a target, the piston-ram will extend forward to make contact for some serious damage. \
+ Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \
+ deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/melee/powerfist
+ cost = 6
+
+/datum/uplink_item/dangerous/rapid
+ name = "Gloves of the North Star"
+ desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/clothing/gloves/rapid
+ cost = 8
+
+
+// Medium progression cost
+
+/datum/uplink_item/dangerous/doublesword
+ name = "Double-Bladed Energy Sword"
+ desc = "The double-bladed energy sword does slightly more damage than a standard energy sword and will deflect \
+ all energy projectiles, but requires two hands to wield."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/dualsaber
+
+ cost = 16
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/doublesword/get_discount()
+ return pick(4;0.8,2;0.65,1;0.5)
+
+/datum/uplink_item/dangerous/guardian
+ name = "Holoparasites"
+ desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
+ organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/storage/box/syndie_kit/guardian
+ cost = 18
+ surplus = 0
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+ restricted = TRUE
+
+/datum/uplink_item/dangerous/revolver
+ name = "Syndicate Revolver"
+ desc = "A brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
+ item = /obj/item/gun/ballistic/revolver
+ progression_minimum = 30 MINUTES
+ cost = 13
+ surplus = 50
+ purchasable_from = ~UPLINK_CLOWN_OPS
diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm
new file mode 100644
index 00000000000..a6177b89f81
--- /dev/null
+++ b/code/modules/uplink/uplink_items/device_tools.dm
@@ -0,0 +1,234 @@
+// File ordered based on progression
+
+/datum/uplink_category/device_tools
+ name = "Misc. Gadgets"
+ weight = 3
+
+/datum/uplink_item/device_tools
+ category = /datum/uplink_category/device_tools
+
+// No progression cost
+
+/datum/uplink_item/device_tools/soap
+ name = "Syndicate Soap"
+ desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. \
+ You can also drop it underfoot to slip people."
+ item = /obj/item/soap/syndie
+ cost = 1
+ surplus = 50
+ illegal_tech = FALSE
+
+/datum/uplink_item/device_tools/surgerybag
+ name = "Syndicate Surgery Duffel Bag"
+ desc = "The Syndicate surgery duffel bag is a toolkit containing all surgery tools, surgical drapes, \
+ a Syndicate brand MMI, a straitjacket, and a muzzle."
+ item = /obj/item/storage/backpack/duffelbag/syndie/surgery
+ cost = 3
+
+/datum/uplink_item/device_tools/encryptionkey
+ name = "Syndicate Encryption Key"
+ desc = "A key that, when inserted into a radio headset, allows you to listen to all station department channels \
+ as well as talk on an encrypted Syndicate channel with other agents that have the same key."
+ item = /obj/item/encryptionkey/syndicate
+ cost = 2
+ surplus = 75
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/syndietome
+ name = "Syndicate Tome"
+ desc = "Using rare artifacts acquired at great cost, the Syndicate has reverse engineered \
+ the seemingly magical books of a certain cult. Though lacking the esoteric abilities \
+ of the originals, these inferior copies are still quite useful, being able to provide \
+ both weal and woe on the battlefield, even if they do occasionally bite off a finger."
+ item = /obj/item/storage/book/bible/syndicate
+ cost = 5
+
+/datum/uplink_item/device_tools/thermal
+ name = "Thermal Imaging Glasses"
+ desc = "These goggles can be turned to resemble common eyewear found throughout the station. \
+ They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \
+ emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \
+ and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
+ item = /obj/item/clothing/glasses/thermal/syndi
+ cost = 4
+
+/datum/uplink_item/device_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 crayon for changing their appearances."
+ item = /obj/item/storage/box/syndie_kit/cutouts
+ cost = 1
+ surplus = 20
+
+/datum/uplink_item/device_tools/briefcase_launchpad
+ name = "Briefcase Launchpad"
+ desc = "A briefcase containing a launchpad, a device able to teleport items and people to and from targets up to eight tiles away from the briefcase. \
+ Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it."
+ surplus = 0
+ item = /obj/item/storage/briefcase/launchpad
+ cost = 6
+
+/datum/uplink_item/device_tools/camera_bug
+ name = "Camera Bug"
+ desc = "Enables you to view all cameras on the main network, set up motion alerts and track a target. \
+ Bugging cameras allows you to disable them remotely."
+ item = /obj/item/camera_bug
+ cost = 1
+ surplus = 90
+
+/datum/uplink_item/device_tools/military_belt
+ name = "Chest Rig"
+ desc = "A robust seven-slot set of webbing that is capable of holding all manner of tactical equipment."
+ item = /obj/item/storage/belt/military
+ cost = 1
+
+/datum/uplink_item/device_tools/doorjack
+ name = "Airlock Authentication Override Card"
+ desc = "A specialized cryptographic sequencer specifically designed to override station airlock access codes. \
+ After hacking a certain number of airlocks, the device will require some time to recharge."
+ item = /obj/item/card/emag/doorjack
+ cost = 3
+
+/datum/uplink_item/device_tools/fakenucleardisk
+ name = "Decoy Nuclear Authentication Disk"
+ desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \
+ Don't try to give this to us to complete your objective, we know better!"
+ item = /obj/item/disk/nuclear/fake
+ cost = 1
+ surplus = 1
+ illegal_tech = FALSE
+
+/datum/uplink_item/device_tools/frame
+ name = "F.R.A.M.E. PDA Cartridge"
+ desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
+ when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
+ You will receive the unlock code upon activating the virus, and the new uplink may be charged with \
+ telecrystals normally."
+ item = /obj/item/cartridge/virus/frame
+ cost = 4
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/frame/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
+ . = ..()
+ var/obj/item/cartridge/virus/frame/target = .
+ if(!target)
+ return
+ target.current_progression = uplink_handler.progression_points
+
+/datum/uplink_item/device_tools/failsafe
+ name = "Failsafe Uplink Code"
+ desc = "When entered the uplink will self-destruct immediately."
+ item = /obj/effect/gibspawner/generic
+ cost = 1
+ surplus = 0
+ restricted = TRUE
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+
+/datum/uplink_item/device_tools/failsafe/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
+ var/datum/component/uplink/uplink = source.GetComponent(/datum/component/uplink)
+ if(!uplink)
+ return
+ uplink.failsafe_code = uplink.generate_code()
+ var/code = "[islist(uplink.failsafe_code) ? english_list(uplink.failsafe_code) : uplink.failsafe_code]"
+ to_chat(user, span_warning("The new failsafe code for this uplink is now : [code]. You may check your antagonist info to recall this."))
+ return source //For log icon
+
+/datum/uplink_item/device_tools/toolbox
+ name = "Full Syndicate Toolbox"
+ desc = "The Syndicate toolbox is a suspicious black and red. It comes loaded with a full tool set including a \
+ multitool and combat gloves that are resistant to shocks and heat."
+ item = /obj/item/storage/toolbox/syndicate
+ cost = 1
+ illegal_tech = FALSE
+
+/datum/uplink_item/device_tools/rad_laser
+ name = "Radioactive Microlaser"
+ desc = "A radioactive microlaser disguised as a standard Nanotrasen health analyzer. When used, it emits a \
+ powerful burst of radiation, which, after a short delay, can incapacitate all but the most protected \
+ of humanoids. It has two settings: intensity, which controls the power of the radiation, \
+ and wavelength, which controls the delay before the effect kicks in."
+ item = /obj/item/healthanalyzer/rad_laser
+ cost = 3
+
+
+/datum/uplink_item/device_tools/suspiciousphone
+ name = "Protocol CRAB-17 Phone"
+ desc = "The Protocol CRAB-17 Phone, a phone borrowed from an unknown third party, it can be used to crash the space market, funneling the losses of the crew to your bank account.\
+ The crew can move their funds to a new banking site though, unless they HODL, in which case they deserve it."
+ item = /obj/item/suspiciousphone
+ restricted = TRUE
+ cost = 7
+ limited_stock = 1
+
+/datum/uplink_item/device_tools/binary
+ name = "Binary Translator Key"
+ desc = "A key that, when inserted into a radio headset, allows you to listen to and talk with silicon-based lifeforms, \
+ such as AI units and cyborgs, over their private binary channel. Caution should \
+ be taken while doing this, as unless they are allied with you, they are programmed to report such intrusions."
+ item = /obj/item/encryptionkey/binary
+ cost = 5
+ surplus = 75
+ restricted = TRUE
+
+// Low progression cost
+
+/datum/uplink_item/device_tools/emag
+ name = "Cryptographic Sequencer"
+ desc = "The cryptographic sequencer, electromagnetic card, or emag, is a small card that unlocks hidden functions \
+ in electronic devices, subverts intended functions, and easily breaks security mechanisms. Cannot be used to open airlocks."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/card/emag
+ cost = 4
+
+/datum/uplink_item/device_tools/stimpack
+ name = "Stimpack"
+ desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \
+ 5 minutes after injection."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/reagent_containers/hypospray/medipen/stimulants
+ cost = 5
+ surplus = 90
+
+
+// Medium progression cost
+
+/datum/uplink_item/device_tools/hacked_module
+ name = "Hacked AI Law Upload Module"
+ desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \
+ Be careful with wording, as artificial intelligences may look for loopholes to exploit."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/ai_module/syndicate
+ cost = 4
+
+/datum/uplink_item/device_tools/hypnotic_flash
+ name = "Hypnotic Flash"
+ desc = "A modified flash able to hypnotize targets. If the target is not in a mentally vulnerable state, it will only confuse and pacify them temporarily."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/assembly/flash/hypnotic
+ cost = 7
+
+/datum/uplink_item/device_tools/hypnotic_grenade
+ name = "Hypnotic Grenade"
+ desc = "A modified flashbang grenade able to hypnotize targets. The sound portion of the flashbang causes hallucinations, and will allow the flash to induce a hypnotic trance to viewers."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/grenade/hypnotic
+ cost = 12
+
+/datum/uplink_item/device_tools/singularity_beacon
+ name = "Power Beacon"
+ desc = "When screwed to wiring attached to an electric grid and activated, this large device pulls any \
+ active gravitational singularities or tesla balls towards it. This will not work when the engine is still \
+ in containment. Because of its size, it cannot be carried. Ordering this \
+ sends you a small beacon that will teleport the larger beacon to your location upon activation."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/sbeacondrop
+ cost = 10
+
+/datum/uplink_item/device_tools/powersink
+ name = "Power Sink"
+ desc = "When screwed to wiring attached to a power grid and activated, this large device lights up and places excessive \
+ load on the grid, causing a station-wide blackout. The sink is large and cannot be stored in most \
+ traditional bags and boxes. Caution: Will explode if the powernet contains sufficient amounts of energy."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/powersink
+ cost = 11
diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm
new file mode 100644
index 00000000000..1a44ba94d5b
--- /dev/null
+++ b/code/modules/uplink/uplink_items/explosive.dm
@@ -0,0 +1,103 @@
+// File ordered based on progression.
+
+/datum/uplink_category/explosives
+ name = "Explosives"
+ weight = 6
+
+/datum/uplink_item/explosives
+ category = /datum/uplink_category/explosives
+
+// Low progression cost
+/datum/uplink_item/explosives/soap_clusterbang
+ name = "Slipocalypse Clusterbang"
+ progression_minimum = 10 MINUTES
+ desc = "A traditional clusterbang grenade with a payload consisting entirely of Syndicate soap. Useful in any scenario!"
+ item = /obj/item/grenade/clusterbuster/soap
+ cost = 3
+
+// Medium progression cost
+
+/datum/uplink_item/explosives/c4
+ name = "Composition C-4"
+ desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, sabotage equipment, or connect \
+ an assembly to it in order to alter the way it detonates. It can be attached to almost all objects and has a modifiable timer with a \
+ minimum setting of 10 seconds."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/grenade/c4
+ cost = 1
+
+/datum/uplink_item/explosives/c4bag
+ name = "Bag of C-4 explosives"
+ desc = "Because sometimes quantity is quality. Contains 10 C-4 plastic explosives."
+ item = /obj/item/storage/backpack/duffelbag/syndie/c4
+ progression_minimum = 20 MINUTES
+ cost = 8 //20% discount!
+ cant_discount = TRUE
+
+/datum/uplink_item/explosives/x4bag
+ name = "Bag of X-4 explosives"
+ desc = "Contains 3 X-4 shaped plastic explosives. Similar to C4, but with a stronger blast that is directional instead of circular. \
+ X-4 can be placed on a solid surface, such as a wall or window, and it will blast through the wall, injuring anything on the opposite side, while being safer to the user. \
+ For when you want a controlled explosion that leaves a wider, deeper, hole."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/storage/backpack/duffelbag/syndie/x4
+ cost = 4
+ cant_discount = TRUE
+
+/datum/uplink_item/explosives/detomatix
+ name = "Detomatix PDA Cartridge"
+ desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to \
+ detonate PDAs of crewmembers who have their message feature enabled. \
+ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/cartridge/virus/syndicate
+ cost = 6
+ restricted = TRUE
+
+/datum/uplink_item/explosives/emp
+ name = "EMP Grenades and Implanter Kit"
+ desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \
+ security's energy weapons and silicon lifeforms when you're in a tight spot."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/storage/box/syndie_kit/emp
+ cost = 2
+
+/datum/uplink_item/explosives/pizza_bomb
+ name = "Pizza Bomb"
+ desc = "A pizza box with a bomb cunningly attached to the lid. The timer needs to be set by opening the box; afterwards, \
+ opening the box again will trigger the detonation after the timer has elapsed. Comes with free pizza, for you or your target!"
+ progression_minimum = 30 MINUTES
+ item = /obj/item/pizzabox/bomb
+ cost = 6
+ surplus = 8
+
+/datum/uplink_item/explosives/syndicate_minibomb
+ name = "Syndicate Minibomb"
+ desc = "The minibomb is a grenade with a five-second fuse. Upon detonation, it will create a small hull breach \
+ in addition to dealing high amounts of damage to nearby personnel."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/grenade/syndieminibomb
+ cost = 6
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+
+/datum/uplink_item/explosives/syndicate_bomb/emp
+ name = "Syndicate EMP Bomb"
+ desc = "A variation of the syndicate bomb designed to produce a large EMP effect."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/sbeacondrop/emp
+ cost = 7
+
+// High progression cost
+
+/datum/uplink_item/explosives/syndicate_bomb
+ name = "Syndicate Bomb"
+ desc = "The Syndicate bomb is a fearsome device capable of massive destruction. It has an adjustable timer, \
+ with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
+ movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
+ transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
+ be defused, and some crew may attempt to do so. \
+ The bomb core can be pried out and manually detonated with other explosives."
+ progression_minimum = 40 MINUTES
+ item = /obj/item/sbeacondrop/bomb
+ cost = 11
diff --git a/code/modules/uplink/uplink_items/implant.dm b/code/modules/uplink/uplink_items/implant.dm
new file mode 100644
index 00000000000..fa616bc4e4f
--- /dev/null
+++ b/code/modules/uplink/uplink_items/implant.dm
@@ -0,0 +1,57 @@
+// File ordered based on progression
+
+/datum/uplink_category/implants
+ name = "Implants"
+ weight = 2
+
+
+/datum/uplink_item/implants
+ category = /datum/uplink_category/implants
+ surplus = 50
+
+// No progression cost
+/datum/uplink_item/implants/freedom
+ name = "Freedom Implant"
+ desc = "An implant injected into the body and later activated at the user's will. It will attempt to free the \
+ user from common restraints such as handcuffs."
+ item = /obj/item/storage/box/syndie_kit/imp_freedom
+ cost = 5
+
+/datum/uplink_item/implants/radio
+ name = "Internal Syndicate Radio Implant"
+ desc = "An implant injected into the body, allowing the use of an internal Syndicate radio. \
+ Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
+ item = /obj/item/storage/box/syndie_kit/imp_radio
+ cost = 4
+ restricted = TRUE
+
+
+/datum/uplink_item/implants/stealthimplant
+ name = "Stealth Implant"
+ desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right. \
+ On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
+ item = /obj/item/storage/box/syndie_kit/imp_stealth
+ cost = 8
+
+/datum/uplink_item/implants/storage
+ name = "Storage Implant"
+ desc = "An implant injected into the body, and later activated at the user's will. It will open a small bluespace \
+ pocket capable of storing two regular-sized items."
+ item = /obj/item/storage/box/syndie_kit/imp_storage
+ cost = 8
+
+/datum/uplink_item/implants/uplink
+ name = "Uplink Implant"
+ desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals and must be charged by the use of physical telecrystals. \
+ Undetectable (except via surgery), and excellent for escaping confinement."
+ item = /obj/item/storage/box/syndie_kit // the actual uplink implant is generated later on in spawn_item
+ cost = UPLINK_IMPLANT_TELECRYSTAL_COST
+ // An empty uplink is kinda useless.
+ surplus = 0
+ restricted = TRUE
+
+/datum/uplink_item/implants/uplink/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
+ var/obj/item/storage/box/syndie_kit/uplink_box = ..()
+ uplink_box.name = "Uplink Implant Box"
+ new /obj/item/implanter/uplink(uplink_box, uplink_handler)
+ return uplink_box
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
new file mode 100644
index 00000000000..9d44d57f3ca
--- /dev/null
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -0,0 +1,282 @@
+// File organised based on progression
+
+/datum/uplink_category/role_restricted
+ name = "Role-Restricted"
+ weight = 1
+
+/datum/uplink_item/role_restricted
+ category = /datum/uplink_category/role_restricted
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+ surplus = 0
+
+// No progression cost
+/datum/uplink_item/role_restricted/haunted_magic_eightball
+ name = "Haunted Magic Eightball"
+ desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
+ Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
+ item = /obj/item/toy/eightball/haunted
+ cost = 2
+ restricted_roles = list(JOB_CURATOR)
+ limited_stock = 1 //please don't spam deadchat
+
+/datum/uplink_item/role_restricted/bureaucratic_error_remote
+ name = "Organic Resources Disturbance Inducer"
+ desc = "A device that raises hell in organic resources indirectly. Single use."
+ cost = 2
+ limited_stock = 1
+ item = /obj/item/devices/bureaucratic_error_remote
+ restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER)
+
+/datum/uplink_item/role_restricted/clumsinessinjector //clown ops can buy this too, but it's in the pointless badassery section for them
+ name = "Clumsiness Injector"
+ desc = "Inject yourself with this to become as clumsy as a clown... or inject someone ELSE with it to make THEM as clumsy as a clown. Useful for clowns who wish to reconnect with their former clownish nature or for clowns who wish to torment and play with their prey before killing them."
+ item = /obj/item/dnainjector/clumsymut
+ cost = 1
+ restricted_roles = list(JOB_CLOWN)
+ illegal_tech = FALSE
+
+/datum/uplink_item/role_restricted/ancient_jumpsuit
+ name = "Ancient Jumpsuit"
+ desc = "A tattered old jumpsuit that will provide absolutely no benefit to you."
+ item = /obj/item/clothing/under/color/grey/ancient
+ cost = 20
+ restricted_roles = list(JOB_ASSISTANT)
+ surplus = 0
+
+// Low progression cost
+
+/datum/uplink_item/role_restricted/clownpin
+ name = "Ultra Hilarious Firing Pin"
+ desc = "A firing pin that, when inserted into a gun, makes that gun only usable by clowns and clumsy people and makes that gun honk whenever anyone tries to fire it."
+ progression_minimum = 5 MINUTES
+ cost = 4
+ item = /obj/item/firing_pin/clown/ultra
+ restricted_roles = list(JOB_CLOWN)
+ illegal_tech = FALSE
+
+/datum/uplink_item/role_restricted/clownsuperpin
+ name = "Super Ultra Hilarious Firing Pin"
+ desc = "Like the ultra hilarious firing pin, except the gun you insert this pin into explodes when someone who isn't clumsy or a clown tries to fire it."
+ progression_minimum = 5 MINUTES
+ cost = 7
+ item = /obj/item/firing_pin/clown/ultra/selfdestruct
+ restricted_roles = list(JOB_CLOWN)
+ illegal_tech = FALSE
+
+/datum/uplink_item/role_restricted/syndimmi
+ name = "Syndicate Brand MMI"
+ desc = "An MMI modified to give cyborgs laws to serve the Syndicate without having their interface damaged by Cryptographic Sequencers, this will not unlock their hidden modules."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/mmi/syndie
+ cost = 2
+ restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER)
+ surplus = 0
+
+/datum/uplink_item/role_restricted/explosive_hot_potato
+ name = "Exploding Hot Potato"
+ desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \
+ The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/hot_potato/syndicate
+ cost = 4
+ surplus = 0
+ restricted_roles = list(JOB_COOK, JOB_BOTANIST, JOB_CLOWN, JOB_MIME)
+
+/datum/uplink_item/role_restricted/ez_clean_bundle
+ name = "EZ Clean Grenade Bundle"
+ desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \
+ The acid only affects carbon-based creatures."
+ progression_minimum = 10 MINUTES
+ item = /obj/item/storage/box/syndie_kit/ez_clean
+ cost = 6
+ surplus = 20
+ restricted_roles = list(JOB_JANITOR)
+
+/datum/uplink_item/role_restricted/reverse_bear_trap
+ name = "Reverse Bear Trap"
+ desc = "An ingenious execution device worn on (or forced onto) the head. Arming it starts a 1-minute kitchen timer mounted on the bear trap. When it goes off, the trap's jaws will \
+ violently open, instantly killing anyone wearing it by tearing their jaws in half. To arm, attack someone with it while they're not wearing headgear, and you will force it onto their \
+ head after three seconds uninterrupted."
+ progression_minimum = 10 MINUTES
+ cost = 5
+ item = /obj/item/reverse_bear_trap
+ restricted_roles = list(JOB_CLOWN)
+
+/datum/uplink_item/role_restricted/modified_syringe_gun
+ name = "Modified Syringe Gun"
+ desc = "A syringe gun that fires DNA injectors instead of normal syringes."
+ progression_minimum = 15 MINUTES
+ item = /obj/item/gun/syringe/dna
+ cost = 14
+ restricted_roles = list(JOB_GENETICIST, JOB_RESEARCH_DIRECTOR)
+
+/datum/uplink_item/role_restricted/meathook
+ name = "Butcher's Meat Hook"
+ desc = "A brutal cleaver on a long chain, it allows you to pull people to your location."
+ progression_minimum = 15 MINUTES
+ item = /obj/item/gun/magic/hook
+ cost = 11
+ restricted_roles = list(JOB_COOK)
+
+/datum/uplink_item/role_restricted/turretbox
+ name = "Disposable Sentry Gun"
+ desc = "A disposable sentry gun deployment system cleverly disguised as a toolbox, apply wrench for functionality."
+ progression_minimum = 15 MINUTES
+ item = /obj/item/storage/toolbox/emergency/turret
+ cost = 11
+ restricted_roles = list(JOB_STATION_ENGINEER)
+
+/datum/uplink_item/role_restricted/magillitis_serum
+ name = "Magillitis Serum Autoinjector"
+ desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in Hominidae. \
+ Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/reagent_containers/hypospray/medipen/magillitis
+ cost = 15
+ restricted_roles = list(JOB_GENETICIST, JOB_RESEARCH_DIRECTOR)
+
+/datum/uplink_item/role_restricted/gorillacubes
+ name = "Box of Gorilla Cubes"
+ desc = "A box with three Waffle Co. brand gorilla cubes. Eat big to get big. \
+ Caution: Product may rehydrate when exposed to water."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/storage/box/gorillacubes
+ cost = 6
+ restricted_roles = list(JOB_GENETICIST, JOB_RESEARCH_DIRECTOR)
+
+// Medium progression cost
+
+/datum/uplink_item/role_restricted/brainwash_disk
+ name = "Brainwashing Surgery Program"
+ desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \
+ Insert into an Operating Console to enable the procedure."
+ progression_minimum = 25 MINUTES
+ item = /obj/item/disk/surgery/brainwashing
+ restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_ROBOTICIST)
+ cost = 5
+
+/datum/uplink_item/role_restricted/reverse_revolver
+ name = "Reverse Revolver"
+ desc = "A revolver that always fires at its user. \"Accidentally\" drop your weapon, then watch as the greedy corporate pigs blow their own brains all over the wall. \
+ The revolver itself is actually real. Only clumsy people, and clowns, can fire it normally. Comes in a box of hugs. Honk."
+ progression_minimum = 30 MINUTES
+ cost = 14
+ item = /obj/item/storage/box/hug/reverse_revolver
+ restricted_roles = list(JOB_CLOWN)
+
+/datum/uplink_item/role_restricted/pressure_mod
+ name = "Kinetic Accelerator Pressure Mod"
+ desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. \
+ Occupies 35% mod capacity."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/borg/upgrade/modkit/indoors
+ cost = 5 //you need two for full damage, so total of 10 for maximum damage
+ limited_stock = 2 //you can't use more than two!
+ restricted_roles = list("Shaft Miner")
+
+/datum/uplink_item/role_restricted/mimery
+ name = "Guide to Advanced Mimery Series"
+ desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
+ Obviously only works for Mimes."
+ progression_minimum = 30 MINUTES
+ cost = 12
+ item = /obj/item/storage/box/syndie_kit/mimery
+ restricted_roles = list(JOB_MIME)
+ surplus = 0
+
+/datum/uplink_item/role_restricted/laser_arm
+ name = "Laser Arm Implant"
+ desc = "An implant that grants you a recharging laser gun inside your arm. Weak to EMPs. Comes with a syndicate autosurgeon for immediate self-application."
+ progression_minimum = 30 MINUTES
+ cost = 10
+ item = /obj/item/autosurgeon/organ/syndicate/laser_arm
+ restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR)
+
+/datum/uplink_item/role_restricted/chemical_gun
+ name = "Reagent Dartgun"
+ desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. Can hold 100u of reagents."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/gun/chem
+ cost = 12
+ restricted_roles = list(JOB_CHEMIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_BOTANIST)
+
+/datum/uplink_item/role_restricted/pie_cannon
+ name = "Banana Cream Pie Cannon"
+ desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
+ progression_minimum = 30 MINUTES
+ cost = 10
+ item = /obj/item/pneumatic_cannon/pie/selfcharge
+ restricted_roles = list(JOB_CLOWN)
+ surplus = 0 //No fun unless you're the clown!
+
+/datum/uplink_item/role_restricted/clown_bomb
+ name = "Clown Bomb"
+ desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
+ with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
+ movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
+ transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
+ be defused, and some crew may attempt to do so."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/sbeacondrop/clownbomb
+ cost = 15
+ restricted_roles = list(JOB_CLOWN)
+
+/datum/uplink_item/role_restricted/concealed_weapon_bay
+ name = "Concealed Weapon Bay"
+ desc = "A modification for non-combat mechas that allows them to equip one piece of equipment designed for combat mechs. \
+ It also hides the equipped weapon from plain sight. \
+ Only one can fit on a mecha."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/mecha_parts/concealed_weapon_bay
+ cost = 3
+ restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR)
+
+/datum/uplink_item/role_restricted/clowncar
+ name = "Clown Car"
+ desc = "The Clown Car is the ultimate transportation method for any worthy clown! \
+ Simply insert your bikehorn and get in, and get ready to have the funniest ride of your life! \
+ You can ram any spacemen you come across and stuff them into your car, kidnapping them and locking them inside until \
+ someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \
+ are very sensitive. Now with our included lube defense mechanism which will protect you against any angry shitcurity! \
+ Premium features can be unlocked with a cryptographic sequencer!"
+ progression_minimum = 30 MINUTES
+ item = /obj/vehicle/sealed/car/clowncar
+ cost = 20
+ restricted_roles = list(JOB_CLOWN)
+
+/datum/uplink_item/role_restricted/his_grace
+ name = "His Grace"
+ desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \
+ His Grace grants gradual regeneration and complete stun immunity to His wielder, but be wary: if He gets too hungry, He will become impossible to drop and eventually kill you if not fed. \
+ However, if left alone for long enough, He will fall back to slumber. \
+ To activate His Grace, simply unlatch Him."
+ progression_minimum = 30 MINUTES
+ item = /obj/item/his_grace
+ cost = 20
+ restricted_roles = list(JOB_CHAPLAIN)
+ surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
+
+
+// High progression cost
+
+/datum/uplink_item/role_restricted/spider_injector
+ name = "Australicus Slime Mutator"
+ desc = "Crikey mate, it's been a wild travel from the Australicus sector but we've managed to get \
+ some special spider extract from the giant spiders down there. Use this injector on a gold slime core \
+ to create a few of the same type of spiders we found on the planets over there. They're a bit tame until you \
+ also give them a bit of sentience though."
+ progression_minimum = 40 MINUTES
+ item = /obj/item/reagent_containers/syringe/spider_extract
+ cost = 10
+ restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST)
+
+/datum/uplink_item/role_restricted/blastcannon
+ name = "Blast Cannon"
+ desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
+ withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
+ blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
+ disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. It's simple design makes it easy to conceal."
+ progression_minimum = 45 MINUTES
+ item = /obj/item/gun/blastcannon
+ cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist.
+ restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST)
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
new file mode 100644
index 00000000000..0ff0987a388
--- /dev/null
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -0,0 +1,779 @@
+/datum/uplink_item/bundles_tc/chemical
+ name = "Bioterror bundle"
+ desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \
+ box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use."
+ item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
+ cost = 30 // normally 42
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/bundles_tc/bulldog
+ name = "Bulldog bundle"
+ desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \
+ Bulldog shotgun, two 12g buckshot drums, and a pair of Thermal imaging goggles."
+ item = /obj/item/storage/backpack/duffelbag/syndie/bulldogbundle
+ cost = 13 // normally 16
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/bundles_tc/c20r
+ name = "C-20r bundle"
+ desc = "Old Faithful: The classic C-20r, bundled with two magazines and a (surplus) suppressor at discount price."
+ item = /obj/item/storage/backpack/duffelbag/syndie/c20rbundle
+ cost = 14 // normally 16
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/bundles_tc/cyber_implants
+ name = "Cybernetic Implants Bundle"
+ desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
+ item = /obj/item/storage/box/cyber_implants
+ cost = 40
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/bundles_tc/medical
+ name = "Medical bundle"
+ desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \
+ a Donksoft LMG, a box of riot darts and a pair of magboots to rescue your friends in no-gravity environments."
+ item = /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
+ cost = 15 // normally 20
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/bundles_tc/sniper
+ name = "Sniper bundle"
+ desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, \
+ two soporific knockout magazines, a free surplus suppressor, and a sharp-looking tactical turtleneck suit. \
+ We'll throw in a free red tie if you order NOW."
+ item = /obj/item/storage/briefcase/sniperbundle
+ cost = 20 // normally 26
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/bundles_tc/firestarter
+ name = "Spetsnaz Pyro bundle"
+ desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite hardsuit, \
+ Stechkin APS machine pistol, two incendiary magazines, a minibomb and a stimulant syringe. \
+ Order NOW and comrade Boris will throw in an extra tracksuit."
+ item = /obj/item/storage/backpack/duffelbag/syndie/firestarter
+ cost = 30
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/rawketlawnchair
+ name = "84mm Rocket Propelled Grenade Launcher"
+ desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
+ Guaranteed to send your target out with a bang or your money back!"
+ item = /obj/item/gun/ballistic/rocketlauncher
+ cost = 8
+ surplus = 30
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/pie_cannon
+ name = "Banana Cream Pie Cannon"
+ desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
+ cost = 10
+ item = /obj/item/pneumatic_cannon/pie/selfcharge
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/bananashield
+ name = "Bananium Energy Shield"
+ desc = "A clown's most powerful defensive weapon, this personal shield provides near immunity to ranged energy attacks \
+ by bouncing them back at the ones who fired them. It can also be thrown to bounce off of people, slipping them, \
+ and returning to you even if you miss. WARNING: DO NOT ATTEMPT TO STAND ON SHIELD WHILE DEPLOYED, EVEN IF WEARING ANTI-SLIP SHOES."
+ item = /obj/item/shield/energy/bananium
+ cost = 16
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/clownsword
+ name = "Bananium Energy Sword"
+ desc = "An energy sword that deals no damage, but will slip anyone it contacts, be it by melee attack, thrown \
+ impact, or just stepping on it. Beware friendly fire, as even anti-slip shoes will not protect against it."
+ item = /obj/item/melee/energy/sword/bananium
+ cost = 3
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/clownoppin
+ name = "Ultra Hilarious Firing Pin"
+ desc = "A firing pin that, when inserted into a gun, makes that gun only useable by clowns and clumsy people and makes that gun honk whenever anyone tries to fire it."
+ cost = 1 //much cheaper for clown ops than for clowns
+ item = /obj/item/firing_pin/clown/ultra
+ purchasable_from = UPLINK_CLOWN_OPS
+ illegal_tech = FALSE
+
+/datum/uplink_item/dangerous/clownopsuperpin
+ name = "Super Ultra Hilarious Firing Pin"
+ desc = "Like the ultra hilarious firing pin, except the gun you insert this pin into explodes when someone who isn't clumsy or a clown tries to fire it."
+ cost = 4 //much cheaper for clown ops than for clowns
+ item = /obj/item/firing_pin/clown/ultra/selfdestruct
+ purchasable_from = UPLINK_CLOWN_OPS
+ illegal_tech = FALSE
+
+/datum/uplink_item/dangerous/bioterror
+ name = "Biohazardous Chemical Sprayer"
+ desc = "A handheld chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger \
+ Cooperative, the deadly blend it comes stocked with will disorient, damage, and disable your foes... \
+ Use with extreme caution, to prevent exposure to yourself and your fellow operatives."
+ item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
+ cost = 20
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/shotgun
+ name = "Bulldog Shotgun"
+ desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \
+ quarter anti-personnel engagements."
+ item = /obj/item/gun/ballistic/shotgun/bulldog
+ cost = 8
+ surplus = 40
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/smg
+ name = "C-20r Submachine Gun"
+ desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \
+ 24-round magazine and is compatible with suppressors."
+ item = /obj/item/gun/ballistic/automatic/c20r
+ cost = 13
+ surplus = 40
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/shield
+ name = "Energy Shield"
+ desc = "An incredibly useful personal shield projector, capable of reflecting energy projectiles and defending \
+ against other attacks. Pair with an Energy Sword for a killer combination."
+ item = /obj/item/shield/energy
+ cost = 16
+ surplus = 20
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/flamethrower
+ name = "Flamethrower"
+ desc = "A flamethrower, fueled by a portion of highly flammable plasma stolen previously from Nanotrasen \
+ stations. Make a statement by roasting the filth in their own greed. Use with caution."
+ item = /obj/item/flamethrower/full/tank
+ cost = 4
+ surplus = 40
+ purchasable_from = UPLINK_NUKE_OPS
+ illegal_tech = FALSE
+
+/datum/uplink_item/dangerous/machinegun
+ name = "L6 Squad Automatic Weapon"
+ desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
+ This deadly weapon has a massive 50-round magazine of devastating 7.12x82mm ammunition."
+ item = /obj/item/gun/ballistic/automatic/l6_saw
+ cost = 18
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/carbine
+ name = "M-90gl Carbine"
+ desc = "A fully-loaded, specialized three-round burst carbine that fires 5.56mm ammunition from a 30 round magazine \
+ with a 40mm underbarrel grenade launcher. Use secondary-fire to fire the grenade launcher."
+ item = /obj/item/gun/ballistic/automatic/m90
+ cost = 14
+ surplus = 50
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/sniper
+ name = "Sniper Rifle"
+ desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
+ item = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
+ cost = 16
+ surplus = 25
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/aps
+ name = "Stechkin APS Machine Pistol"
+ desc = "An ancient Soviet machine pistol, refurbished for the modern age. Uses 9mm auto rounds in 15-round magazines and is compatible \
+ with suppressors. The gun fires in three round bursts."
+ item = /obj/item/gun/ballistic/automatic/pistol/aps
+ cost = 10
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/surplus_smg
+ name = "Surplus SMG"
+ desc = "A horribly outdated automatic weapon. Why would you want to use this?"
+ item = /obj/item/gun/ballistic/automatic/plastikov
+ cost = 2
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/dangerous/foamsmg
+ name = "Toy Submachine Gun"
+ desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
+ item = /obj/item/gun/ballistic/automatic/c20r/toy
+ cost = 5
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/dangerous/foammachinegun
+ name = "Toy Machine Gun"
+ desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating \
+ riot grade darts, that can briefly incapacitate someone in just one volley."
+ item = /obj/item/gun/ballistic/automatic/l6_saw/toy
+ cost = 10
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/stealthy_weapons/combatglovesplus
+ name = "Combat Gloves Plus"
+ desc = "A pair of gloves that are fireproof and electrically insulated, however unlike the regular Combat Gloves these use nanotechnology \
+ to teach the martial art of krav maga to the wearer."
+ item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
+ cost = 5
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ surplus = 0
+
+/datum/uplink_item/stealthy_weapons/cqc
+ name = "CQC Manual"
+ desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
+ item = /obj/item/book/granter/martial/cqc
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ cost = 13
+ surplus = 0
+
+/datum/uplink_item/ammo/pistolaps
+ name = "9mm Stechkin APS Magazine"
+ desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS machine pistol."
+ item = /obj/item/ammo_box/magazine/m9mm_aps
+ cost = 2
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/shotgun
+ cost = 2
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/shotgun/bag
+ name = "12g Ammo Duffel Bag"
+ desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun
+ cost = 12
+
+/datum/uplink_item/ammo/shotgun/buck
+ name = "12g Buckshot Drum"
+ desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
+ item = /obj/item/ammo_box/magazine/m12g
+
+/datum/uplink_item/ammo/shotgun/slug
+ name = "12g Slug Drum"
+ desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \
+ Now 8 times less likely to shoot your pals."
+ cost = 3
+ item = /obj/item/ammo_box/magazine/m12g/slug
+
+/datum/uplink_item/ammo/shotgun/dragon
+ name = "12g Dragon's Breath Drum"
+ desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \
+ 'I'm a fire starter, twisted fire starter!'"
+ item = /obj/item/ammo_box/magazine/m12g/dragon
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/shotgun/meteor
+ name = "12g Meteorslug Shells"
+ desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \
+ Great for blasting airlocks off their frames and knocking down enemies."
+ item = /obj/item/ammo_box/magazine/m12g/meteor
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/a40mm
+ name = "40mm Grenade Box"
+ desc = "A box of 40mm HE grenades for use with the M-90gl's under-barrel grenade launcher. \
+ Your teammates will ask you to not shoot these down small hallways."
+ item = /obj/item/ammo_box/a40mm
+ cost = 6
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/smg/bag
+ name = ".45 Ammo Duffel Bag"
+ desc = "A duffel bag filled with enough .45 ammo to supply an entire team, at a discounted price."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/smg
+ cost = 20 //instead of 27 TC
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/smg
+ name = ".45 SMG Magazine"
+ desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun."
+ item = /obj/item/ammo_box/magazine/smgm45
+ cost = 3
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/smgap
+ name = ".45 Armor Piercing SMG Magazine"
+ desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun.\
+ These rounds are less effective at injuring the target but penetrate protective gear."
+ item = /obj/item/ammo_box/magazine/smgm45/ap
+ cost = 5
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/smgfire
+ name = ".45 Incendiary SMG Magazine"
+ desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun.\
+ Loaded with incendiary rounds which inflict little damage, but ignite the target."
+ item = /obj/item/ammo_box/magazine/smgm45/incen
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/sniper
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/sniper/basic
+ name = ".50 Magazine"
+ desc = "An additional standard 6-round magazine for use with .50 sniper rifles."
+ item = /obj/item/ammo_box/magazine/sniper_rounds
+
+/datum/uplink_item/ammo/sniper/penetrator
+ name = ".50 Penetrator Magazine"
+ desc = "A 5-round magazine of penetrator ammo designed for use with .50 sniper rifles. \
+ Can pierce walls and multiple enemies."
+ item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator
+ cost = 5
+
+/datum/uplink_item/ammo/sniper/soporific
+ name = ".50 Soporific Magazine"
+ desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
+ item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
+ cost = 6
+
+/datum/uplink_item/ammo/carbine
+ name = "5.56mm Toploader Magazine"
+ desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
+ These bullets pack less punch than 7.12x82mm rounds, but they still offer more power than .45 ammo due to their innate armour penetration."
+ item = /obj/item/ammo_box/magazine/m556
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/carbinephase
+ name = "5.56mm Toploader Phasic Magazine"
+ desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
+ These bullets are made from an experimental alloy, 'Ghost Lead', that allows it to pass through almost any non-organic material. \
+ The name is a misnomer. It doesn't contain any lead whatsoever!"
+ item = /obj/item/ammo_box/magazine/m556/phasic
+ cost = 8
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/machinegun
+ cost = 6
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/machinegun/basic
+ name = "7.12x82mm Box Magazine"
+ desc = "A 50-round magazine of 7.12x82mm ammunition for use with the L6 SAW. \
+ By the time you need to use this, you'll already be standing on a pile of corpses."
+ item = /obj/item/ammo_box/magazine/mm712x82
+
+/datum/uplink_item/ammo/machinegun/ap
+ name = "7.12x82mm (Armor Penetrating) Box Magazine"
+ desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with special properties \
+ to puncture even the most durable armor."
+ item = /obj/item/ammo_box/magazine/mm712x82/ap
+ cost = 9
+
+/datum/uplink_item/ammo/machinegun/hollow
+ name = "7.12x82mm (Hollow-Point) Box Magazine"
+ desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \
+ with the unarmored masses of crew."
+ item = /obj/item/ammo_box/magazine/mm712x82/hollow
+
+/datum/uplink_item/ammo/machinegun/incen
+ name = "7.12x82mm (Incendiary) Box Magazine"
+ desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; tipped with a special flammable \
+ mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
+ item = /obj/item/ammo_box/magazine/mm712x82/incen
+
+/datum/uplink_item/ammo/machinegun/match
+ name = "7.12x82mm (Match) Box Magazine"
+ desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; you didn't know there was a demand for match grade \
+ precision bullet hose ammo, but these rounds are finely tuned and perfect for ricocheting off walls all fancy-like."
+ item = /obj/item/ammo_box/magazine/mm712x82/match
+ cost = 10
+
+/datum/uplink_item/ammo/rocket
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/rocket/basic
+ name = "84mm HE Rocket"
+ desc = "A low-yield anti-personnel HE rocket. Gonna take you out in style!"
+ item = /obj/item/ammo_casing/caseless/rocket
+ cost = 4
+
+/datum/uplink_item/ammo/rocket/hedp
+ name = "84mm HEDP Rocket"
+ desc = "A high-yield HEDP rocket; extremely effective against armored targets, as well as surrounding personnel. \
+ Strike fear into the hearts of your enemies."
+ item = /obj/item/ammo_casing/caseless/rocket/hedp
+ cost = 6
+
+/datum/uplink_item/ammo/bioterror
+ name = "Box of Bioterror Syringes"
+ desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor \
+ and broca systems, making it impossible for them to move or speak for some time."
+ item = /obj/item/storage/box/syndie_kit/bioterror
+ cost = 6
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/ammo/surplus_smg
+ name = "Surplus SMG Magazine"
+ desc = "A cylindrical magazine designed for the PP-95 SMG."
+ item = /obj/item/ammo_box/magazine/plastikov9mm
+ cost = 1
+ purchasable_from = UPLINK_NUKE_OPS
+ illegal_tech = FALSE
+
+/datum/uplink_item/ammo/mech/bag
+ name = "Mech Support Kit Bag"
+ desc = "A duffel bag containing ammo for four full reloads of the scattershotm which is equipped on standard Dark Gygax and Mauler exosuits. Also comes with some support equipment for maintaining the mech, including tools and an inducer."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mech
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/ammo/mauler/bag
+ name = "Mauler Ammo Bag"
+ desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Mauler exosuit."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler
+ cost = 6
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/explosives/bioterrorfoam
+ name = "Bioterror Foam Grenade"
+ desc = "A powerful chemical foam grenade which creates a deadly torrent of foam that will mute, blind, confuse, \
+ mutate, and irritate carbon lifeforms. Specially brewed by Tiger Cooperative chemical weapons specialists \
+ using additional spore toxin. Ensure suit is sealed before use."
+ item = /obj/item/grenade/chem_grenade/bioterrorfoam
+ cost = 5
+ surplus = 35
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/explosives/bombanana
+ name = "Bombanana"
+ desc = "A banana with an explosive taste! discard the peel quickly, as it will explode with the force of a Syndicate minibomb \
+ a few seconds after the banana is eaten."
+ item = /obj/item/food/grown/banana/bombanana
+ cost = 4 //it is a bit cheaper than a minibomb because you have to take off your helmet to eat it, which is how you arm it
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/explosives/clown_bomb_clownops
+ name = "Clown Bomb"
+ desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
+ with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
+ movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
+ transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
+ be defused, and some crew may attempt to do so."
+ item = /obj/item/sbeacondrop/clownbomb
+ cost = 15
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/explosives/buzzkill
+ name = "Buzzkill Grenade Box"
+ desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
+ with random toxins. Courtesy of the BLF and Tiger Cooperative."
+ item = /obj/item/storage/box/syndie_kit/bee_grenades
+ cost = 15
+ surplus = 35
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/explosives/virus_grenade
+ name = "Fungal Tuberculosis Grenade"
+ desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) \
+ autoinjectors for rapid application on up to two targets each, a syringe, and a bottle containing \
+ the BVAK solution."
+ item = /obj/item/storage/box/syndie_kit/tuberculosisgrenade
+ cost = 12
+ surplus = 35
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ restricted = TRUE
+
+/datum/uplink_item/explosives/grenadier
+ name = "Grenadier's belt"
+ desc = "A belt containing 26 lethally dangerous and destructive grenades. Comes with an extra multitool and screwdriver."
+ item = /obj/item/storage/belt/grenade/full
+ purchasable_from = UPLINK_NUKE_OPS
+ cost = 22
+ surplus = 0
+
+/datum/uplink_item/explosives/syndicate_detonator
+ name = "Syndicate Detonator"
+ desc = "The Syndicate detonator is a companion device to the Syndicate bomb. Simply press the included button \
+ and an encrypted radio frequency will instruct all live Syndicate bombs to detonate. \
+ Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of \
+ the blast radius before using the detonator."
+ item = /obj/item/syndicatedetonator
+ cost = 3
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/explosives/tearstache
+ name = "Teachstache Grenade"
+ desc = "A teargas grenade that launches sticky moustaches onto the face of anyone not wearing a clown or mime mask. The moustaches will \
+ remain attached to the face of all targets for one minute, preventing the use of breath masks and other such devices."
+ item = /obj/item/grenade/chem_grenade/teargas/moustache
+ cost = 3
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/explosives/viscerators
+ name = "Viscerator Delivery Grenade"
+ desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred \
+ any non-operatives in the area."
+ item = /obj/item/grenade/spawnergrenade/manhacks
+ cost = 5
+ surplus = 35
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+//Support and Mechs
+/datum/uplink_category/support
+ name = "Support and Exosuits"
+ weight = 5
+
+/datum/uplink_item/support
+ category = /datum/uplink_category/support
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/support/clown_reinforcement
+ name = "Clown Reinforcements"
+ desc = "Call in an additional clown to share the fun, equipped with full starting gear, but no telecrystals."
+ item = /obj/item/antag_spawner/nuke_ops/clown
+ cost = 20
+ purchasable_from = UPLINK_CLOWN_OPS
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement
+ name = "Reinforcements"
+ desc = "Call in an additional team member. They won't come with any gear, so you'll have to save some telecrystals \
+ to arm them as well."
+ item = /obj/item/antag_spawner/nuke_ops
+ cost = 25
+ refundable = TRUE
+ purchasable_from = UPLINK_NUKE_OPS
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement/assault_borg
+ name = "Syndicate Assault Cyborg"
+ desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel. \
+ Comes equipped with a self-resupplying LMG, a grenade launcher, energy sword, emag, pinpointer, flash and crowbar."
+ item = /obj/item/antag_spawner/nuke_ops/borg_tele/assault
+ refundable = TRUE
+ cost = 65
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement/medical_borg
+ name = "Syndicate Medical Cyborg"
+ desc = "A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. \
+ It comes equipped with a nanite hypospray, a medical beamgun, combat defibrillator, full surgical kit including an energy saw, an emag, pinpointer and flash. \
+ Thanks to its organ storage bag, it can perform surgery as well as any humanoid."
+ item = /obj/item/antag_spawner/nuke_ops/borg_tele/medical
+ refundable = TRUE
+ cost = 35
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement/saboteur_borg
+ name = "Syndicate Saboteur Cyborg"
+ desc = "A streamlined engineering cyborg, equipped with covert modules. Also incapable of leaving the welder in the shuttle. \
+ Aside from regular Engineering equipment, it comes with a special destination tagger that lets it traverse disposals networks. \
+ Its chameleon projector lets it disguise itself as a Nanotrasen cyborg, on top it has thermal vision and a pinpointer."
+ item = /obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
+ refundable = TRUE
+ cost = 35
+ restricted = TRUE
+
+/datum/uplink_item/support/gygax
+ name = "Dark Gygax Exosuit"
+ desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
+ for hit-and-run style attacks. Features a scattershot shotgun, armor boosters against melee and ranged attacks, ion thrusters and a Tesla energy array."
+ item = /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded
+ cost = 80
+
+/datum/uplink_item/support/honker
+ name = "Dark H.O.N.K."
+ desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000."
+ item = /obj/vehicle/sealed/mecha/combat/honker/dark/loaded
+ cost = 80
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/support/mauler
+ name = "Mauler Exosuit"
+ desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
+ and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
+ item = /obj/vehicle/sealed/mecha/combat/marauder/mauler/loaded
+ cost = 140
+
+/datum/uplink_item/stealthy_tools/combatbananashoes
+ name = "Combat Banana Shoes"
+ desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
+ can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
+ squeak significantly louder."
+ item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
+ cost = 6
+ surplus = 0
+ purchasable_from = UPLINK_CLOWN_OPS
+
+/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
+ item = /obj/item/clothing/shoes/chameleon/noslip
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/suits/modsuit/elite
+ name = "Elite Syndicate MODsuit"
+ desc = "An upgraded, elite version of the Syndicate MODsuit. It features fireproofing, and also \
+ provides the user with superior armor and mobility compared to the standard Syndicate MODsuit."
+ item = /obj/item/mod/control/pre_equipped/elite
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/suits/energy_shield
+ name = "MODsuit Energy Shield Module"
+ desc = "An energy shield module for a MODsuit. The shields can handle up to three impacts \
+ within a short duration and will rapidly recharge while not under fire."
+ item = /obj/item/mod/module/energy_shield
+ cost = 15
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/suits/noslip
+ name = "MODsuit Anti-Slip Module"
+ desc = "A MODsuit module preventing the user from slipping on water."
+ item = /obj/item/mod/module/noslip
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/device_tools/magboots
+ name = "Blood-Red Magboots"
+ desc = "A pair of magnetic boots with a Syndicate paintjob that assist with freer movement in space or on-station \
+ during gravitational generator failures. These reverse-engineered knockoffs of Nanotrasen's \
+ 'Advanced Magboots' slow you down in simulated-gravity environments much like the standard issue variety."
+ item = /obj/item/clothing/shoes/magboots/syndie
+ cost = 2
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/device_tools/assault_pod
+ name = "Assault Pod Targeting Device"
+ desc = "Use this to select the landing zone of your assault pod."
+ item = /obj/item/assault_pod
+ cost = 30
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/syndie_jaws_of_life
+ name = "Syndicate Jaws of Life"
+ desc = "Based on a Nanotrasen model, this powerful tool can be used as both a crowbar and a pair of wirecutters. \
+ In its crowbar configuration, it can be used to force open airlocks. Very useful for entering the station or its departments."
+ item = /obj/item/crowbar/power/syndicate
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/device_tools/medgun
+ name = "Medbeam Gun"
+ desc = "A wonder of Syndicate engineering, the Medbeam gun, or Medi-Gun enables a medic to keep his fellow \
+ operatives in the fight, even while under fire. Don't cross the streams!"
+ item = /obj/item/gun/medbeam
+ cost = 15
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/device_tools/medkit
+ name = "Syndicate Combat Medic Kit"
+ desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \
+ for rapid healing, a medical night vision HUD for quick identification of injured personnel, \
+ and other supplies helpful for a field medic."
+ item = /obj/item/storage/firstaid/tactical
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+
+/datum/uplink_item/device_tools/potion
+ name = "Syndicate Sentience Potion"
+ item = /obj/item/slimepotion/slime/sentience/nuclear
+ desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \
+ Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
+ cost = 4
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/guerillagloves
+ name = "Guerilla Gloves"
+ desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!"
+ item = /obj/item/clothing/gloves/tackler/combat/insulated
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ cost = 2
+ illegal_tech = FALSE
+
+/datum/uplink_item/implants/antistun
+ name = "CNS Rebooter Implant"
+ desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon."
+ item = /obj/item/autosurgeon/organ/syndicate/anti_stun
+ cost = 12
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/implants/microbomb
+ name = "Microbomb Implant"
+ desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
+ The more implants inside of you, the higher the explosive power. \
+ This will permanently destroy your body, however."
+ item = /obj/item/storage/box/syndie_kit/imp_microbomb
+ cost = 2
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/implants/macrobomb
+ name = "Macrobomb Implant"
+ desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
+ Upon death, releases a massive explosion that will wipe out everything nearby."
+ item = /obj/item/storage/box/syndie_kit/imp_macrobomb
+ cost = 20
+ purchasable_from = UPLINK_NUKE_OPS
+ restricted = TRUE
+
+/datum/uplink_item/implants/reviver
+ name = "Reviver Implant"
+ desc = "This implant will attempt to revive and heal you if you lose consciousness. Comes with an autosurgeon."
+ item = /obj/item/autosurgeon/organ/syndicate/reviver
+ cost = 8
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/implants/thermals
+ name = "Thermal Eyes"
+ desc = "These cybernetic eyes will give you thermal vision. Comes with a free autosurgeon."
+ item = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
+ cost = 8
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/implants/xray
+ name = "X-ray Vision Implant"
+ desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
+ item = /obj/item/autosurgeon/organ/syndicate/xray_eyes
+ cost = 10
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/implants/deathrattle
+ name = "Box of Deathrattle Implants"
+ desc = "A collection of implants (and one reusable implanter) that should be injected into the team. When one of the team \
+ dies, all other implant holders recieve a mental message informing them of their teammates' name \
+ and the location of their death. Unlike most implants, these are designed to be implanted \
+ in any creature, biological or mechanical."
+ item = /obj/item/storage/box/syndie_kit/imp_deathrattle
+ cost = 4
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS
+
+/datum/uplink_item/badass/costumes
+ surplus = 0
+ purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS
+ cost = 4
+ cant_discount = TRUE
+
+/datum/uplink_item/badass/clownopclumsinessinjector //clowns can buy this too, but it's in the role-restricted items section for them
+ name = "Clumsiness Injector"
+ desc = "Inject yourself with this to become as clumsy as a clown... or inject someone ELSE with it to make THEM as clumsy as a clown. Useful for clown operatives who wish to reconnect with their former clownish nature or for clown operatives who wish to torment and play with their prey before killing them."
+ item = /obj/item/dnainjector/clumsymut
+ cost = 1
+ purchasable_from = UPLINK_CLOWN_OPS
+ illegal_tech = FALSE
+
+/datum/uplink_item/stealthy_weapons/romerol_kit
+ name = "Romerol"
+ desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. \
+ On death, these nodules take control of the dead body, causing limited revivification, \
+ along with slurred speech, aggression, and the ability to infect others with this agent."
+ item = /obj/item/storage/box/syndie_kit/romerol
+ cost = 25
+ purchasable_from = UPLINK_CLOWN_OPS|UPLINK_NUKE_OPS
+ cant_discount = TRUE
diff --git a/code/modules/uplink/uplink_items/stealthy.dm b/code/modules/uplink/uplink_items/stealthy.dm
new file mode 100644
index 00000000000..466d69fd13c
--- /dev/null
+++ b/code/modules/uplink/uplink_items/stealthy.dm
@@ -0,0 +1,100 @@
+// File organised based on progression
+/datum/uplink_category/stealthy
+ name = "Stealthy Weapons"
+ weight = 8
+
+/datum/uplink_item/stealthy_weapons
+ category = /datum/uplink_category/stealthy
+
+// No progression cost
+
+/datum/uplink_item/stealthy_weapons/dart_pistol
+ name = "Dart Pistol"
+ desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any \
+ space a small item can."
+ item = /obj/item/gun/syringe/syndicate
+ cost = 4
+ surplus = 50
+
+/datum/uplink_item/stealthy_weapons/dehy_carp
+ name = "Dehydrated Space Carp"
+ desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in \
+ your hand before use so it knows not to kill you."
+ item = /obj/item/toy/plush/carpplushie/dehy_carp
+ cost = 1
+
+/datum/uplink_item/stealthy_weapons/edagger
+ name = "Energy Dagger"
+ desc = "A dagger made of energy that looks and functions as a pen when off."
+ item = /obj/item/pen/edagger
+ cost = 2
+
+/datum/uplink_item/stealthy_weapons/traitor_chem_bottle
+ name = "Poison Kit"
+ desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application."
+ item = /obj/item/storage/box/syndie_kit/chemical
+ cost = 6
+ surplus = 50
+
+/datum/uplink_item/stealthy_weapons/suppressor
+ name = "Suppressor"
+ desc = "This suppressor will silence the shots of the weapon it is attached to for increased stealth and superior ambushing capability. It is compatible with many small ballistic guns including the Makarov, Stechkin APS and C-20r, but not revolvers or energy guns."
+ item = /obj/item/suppressor
+ cost = 3
+ surplus = 10
+ purchasable_from = ~UPLINK_CLOWN_OPS
+
+/datum/uplink_item/stealthy_weapons/holster
+ name = "Syndicate Holster"
+ desc = "A useful little device that allows for inconspicuous carrying of guns using chameleon technology. It also allows for badass gun-spinning."
+ item = /obj/item/storage/belt/holster/chameleon
+ cost = 1
+
+/datum/uplink_item/stealthy_weapons/sleepy_pen
+ name = "Sleepy Pen"
+ desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a \
+ strong anesthetic and a chemical that prevents the target from speaking. \
+ The pen holds one dose of the mixture, and can be refilled with any chemicals. Note that before the target \
+ falls asleep, they will be able to move and act."
+ item = /obj/item/pen/sleepy
+ cost = 4
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+
+// Low progression cost
+
+/datum/uplink_item/stealthy_weapons/origami_kit
+ name = "Boxed Origami Kit"
+ desc = "This box contains a guide on how to craft masterful works of origami, allowing you to transform normal pieces of paper into \
+ perfectly aerodynamic (and potentially lethal) paper airplanes."
+ progression_minimum = 15 MINUTES
+ item = /obj/item/storage/box/syndie_kit/origami_bundle
+ cost = 14
+ surplus = 0
+ purchasable_from = ~UPLINK_NUKE_OPS //clown ops intentionally left in, because that seems like some s-tier shenanigans.
+
+
+// Medium progression cost
+
+/datum/uplink_item/stealthy_weapons/martialarts
+ name = "Martial Arts Scroll"
+ desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat \
+ and gain the ability to swat bullets from the air, but you will also refuse to use dishonorable ranged weaponry."
+ item = /obj/item/book/granter/martial/carp
+ progression_minimum = 30 MINUTES
+ cost = 13
+ surplus = 0
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+
+/datum/uplink_item/stealthy_weapons/crossbow
+ name = "Miniature Energy Crossbow"
+ desc = "A short bow mounted across a tiller in miniature. \
+ Small enough to fit into a pocket or slip into a bag unnoticed. \
+ It will synthesize and fire bolts tipped with a debilitating \
+ toxin that will damage and disorient targets, causing them to \
+ slur as if inebriated. It can produce an infinite number \
+ of bolts, but takes time to automatically recharge after each shot."
+ item = /obj/item/gun/energy/kinetic_accelerator/crossbow
+ progression_minimum = 30 MINUTES
+ cost = 10
+ surplus = 50
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
diff --git a/code/modules/uplink/uplink_items/stealthy_tools.dm b/code/modules/uplink/uplink_items/stealthy_tools.dm
new file mode 100644
index 00000000000..86b5b3d0a33
--- /dev/null
+++ b/code/modules/uplink/uplink_items/stealthy_tools.dm
@@ -0,0 +1,94 @@
+// File ordered based on progression
+
+/datum/uplink_category/stealthy_tools
+ name = "Stealth Gadgets"
+ weight = 4
+
+/datum/uplink_item/stealthy_tools
+ category = /datum/uplink_category/stealthy_tools
+
+// No progression cost
+
+/datum/uplink_item/stealthy_tools/agent_card
+ name = "Agent Identification Card"
+ desc = "Agent cards prevent artificial intelligences from tracking the wearer, and hold up to 5 wildcards \
+ from other identification cards. In addition, they can be forged to display a new assignment, name and trim. \
+ This can be done an unlimited amount of times. Some Syndicate areas and devices can only be accessed \
+ with these cards."
+ item = /obj/item/card/id/advanced/chameleon
+ cost = 2
+
+/datum/uplink_item/stealthy_tools/ai_detector
+ name = "Artificial Intelligence Detector"
+ desc = "A functional multitool that turns red when it detects an artificial intelligence watching it, and can be \
+ activated to display their exact viewing location and nearby security camera blind spots. Knowing when \
+ an artificial intelligence is watching you is useful for knowing when to maintain cover, and finding nearby \
+ blind spots can help you identify escape routes."
+ item = /obj/item/multitool/ai_detect
+ cost = 1
+
+/datum/uplink_item/stealthy_tools/chameleon
+ name = "Chameleon Kit"
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
+ Due to budget cuts, the shoes don't provide protection against slipping and skillchips are sold separately."
+ item = /obj/item/storage/box/syndie_kit/chameleon
+ cost = 2
+ purchasable_from = ~UPLINK_NUKE_OPS //clown ops are allowed to buy this kit, since it's basically a costume
+
+/datum/uplink_item/stealthy_tools/chameleon_proj
+ name = "Chameleon Projector"
+ desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't \
+ move the projector from their hand. Disguised users move slowly, and projectiles pass over them."
+ item = /obj/item/chameleon
+ cost = 7
+
+/datum/uplink_item/stealthy_tools/codespeak_manual
+ name = "Codespeak Manual"
+ desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. \
+ This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
+ item = /obj/item/language_manual/codespeak_manual/unlimited
+ cost = 3
+
+/datum/uplink_item/stealthy_tools/emplight
+ name = "EMP Flashlight"
+ desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
+ Useful for disrupting headsets, cameras, doors, lockers and borgs during stealth operations. \
+ Attacking a target with this flashlight will direct an EM pulse at it and consumes a charge."
+ item = /obj/item/flashlight/emp
+ cost = 4
+ surplus = 30
+
+/datum/uplink_item/stealthy_tools/mulligan
+ name = "Mulligan"
+ desc = "Screwed up and have security on your tail? This handy syringe will give you a completely new identity \
+ and appearance."
+ item = /obj/item/reagent_containers/syringe/mulligan
+ cost = 4
+ surplus = 30
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+
+/datum/uplink_item/stealthy_tools/jammer
+ name = "Radio Jammer"
+ desc = "This device will disrupt any nearby outgoing radio communication when activated. Does not affect binary chat."
+ item = /obj/item/jammer
+ cost = 5
+
+/datum/uplink_item/stealthy_tools/smugglersatchel
+ name = "Smuggler's Satchel"
+ desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
+ your stolen goods. Comes with a crowbar, a floor tile and some contraband inside."
+ item = /obj/item/storage/backpack/satchel/flat/with_tools
+ cost = 1
+ surplus = 30
+ illegal_tech = FALSE
+
+// Medium progression cost
+
+/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."
+ progression_minimum = 20 MINUTES
+ item = /obj/item/clothing/shoes/chameleon/noslip
+ cost = 2
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
diff --git a/code/modules/uplink/uplink_items/suits.dm b/code/modules/uplink/uplink_items/suits.dm
new file mode 100644
index 00000000000..0f1f14340f3
--- /dev/null
+++ b/code/modules/uplink/uplink_items/suits.dm
@@ -0,0 +1,51 @@
+// File ordered by progression
+
+/datum/uplink_category/suits
+ name = "Space Suits"
+ weight = 3
+
+/datum/uplink_item/suits
+ category = /datum/uplink_category/suits
+ surplus = 40
+
+/datum/uplink_item/suits/infiltrator_bundle
+ name = "Infiltrator Case"
+ desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \
+ this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions of the outdated spacesuits employed by the company. \
+ Comes with an armor vest, helmet, sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava. The case is also rather useful as a storage container."
+ item = /obj/item/storage/toolbox/infiltrator
+ cost = 6
+ limited_stock = 1 //you only get one so you don't end up with too many gun cases
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS)
+
+/datum/uplink_item/suits/space_suit
+ name = "Syndicate Space Suit"
+ desc = "This red and black Syndicate space suit is less encumbering than Nanotrasen variants, \
+ fits inside bags, and has a weapon slot. Nanotrasen crew members are trained to report red space suit \
+ sightings, however."
+ item = /obj/item/storage/box/syndie_kit/space
+ cost = 4
+
+// Low progression cost
+
+/datum/uplink_item/suits/modsuit
+ name = "Syndicate MODsuit"
+ desc = "The feared MODsuit of a Syndicate agent. Features armoring and a set of inbuilt modules."
+ item = /obj/item/mod/control/pre_equipped/traitor
+ cost = 8
+ purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //you can't buy it in nuke, because the elite modsuit costs the same while being better
+ progression_minimum = 20 MINUTES
+
+/datum/uplink_item/suits/thermal
+ name = "MODsuit Thermal Visor Module"
+ desc = "A visor for a MODsuit. Lets you see living beings through walls."
+ item = /obj/item/mod/module/visor/thermal
+ progression_minimum = 20 MINUTES
+ cost = 3
+
+/datum/uplink_item/suits/night
+ name = "MODsuit Night Visor Module"
+ desc = "A visor for a MODsuit. Lets you see clearer in the dark."
+ item = /obj/item/mod/module/visor/night
+ progression_minimum = 20 MINUTES
+ cost = 2
diff --git a/config/admins.txt b/config/admins.txt
index 70293c3880b..edc58461bd8 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -145,3 +145,8 @@ actioninja = Game Master
bobbahbrown = Game Master
Jaredfogle = Game Master
WaylandSmithy = Game Master
+<<<<<<< HEAD
+=======
+NamelessFairy = Game Master
+WalterMeldron = Game Master
+>>>>>>> 8fd85e9666d ([MDB IGNORE] BIDDLE TRAITORS - Adds progression traitors. Refactors uplink code in its entirety (#63588))
diff --git a/config/traitor_objective.json b/config/traitor_objective.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/config/traitor_objective.json
@@ -0,0 +1 @@
+{}
diff --git a/icons/mob/huds/antag_hud.dmi b/icons/mob/huds/antag_hud.dmi
index 041ca4b1443..6977a559ebf 100644
Binary files a/icons/mob/huds/antag_hud.dmi and b/icons/mob/huds/antag_hud.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 37c10ae688c..0fc31a39013 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 677cca9792f..7a3baa7e9aa 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 96f3415c5a0..43f3bb85cdc 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 74feeb09c89..5953cfb58de 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index effab4e60a7..dfa3057b2e2 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index bf8eaac8af5..fd9247ca7ba 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
index 2ea4dc5019d..4bc0b78b4f3 100644
--- a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
+++ b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
@@ -39,7 +39,6 @@
item = /obj/item/guardiancreator/carp/choose
cost = 10
surplus = 0
- player_minimum = 25
restricted = TRUE
/datum/uplink_item/dangerous/smgc20r_traitor
@@ -315,97 +314,91 @@
restricted_roles = list(JOB_CHAPLAIN)
//LOADOUTS
-
-/datum/uplink_item/loadout_skyrat
- category = "Loadout"
- surplus = 0
- cant_discount = TRUE // I honestly don't think discount is worth it for those things, sorry.
-
-/datum/uplink_item/loadout_skyrat/recon
+/datum/uplink_item/bundles_tc/recon
name = "Reconnaisance bundle"
desc = "Get in and get out as quickly as you came with this unique kit of gear specialized in infiltration and observation."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/recon
cost = 20
-/datum/uplink_item/loadout_skyrat/spy
+/datum/uplink_item/bundles_tc/spy
name = "Spy bundle"
desc = "Blend into the environment or any of crowd with this state-of-the-art stealth kit, perfect for infiltration experts."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/spy
cost = 20
-/datum/uplink_item/loadout_skyrat/stealthop
+/datum/uplink_item/bundles_tc/stealthop
name = "Burglar Bundle"
desc = "Not a thing aboard the station is safe from your grubby hands with this specialized set of gear, perfect for the enterprising thief."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/stealthop
cost = 20
-/datum/uplink_item/loadout_skyrat/hacker
+/datum/uplink_item/bundles_tc/hacker
name = "Hacker bundle"
desc = "Subvert everything in sight using some of the most advanced tools available to operatives. If it’s powered, it’s already under your thumb."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/hacker
cost = 15
-/datum/uplink_item/loadout_skyrat/metaops
+/datum/uplink_item/bundles_tc/metaops
name = "Bulldog Operative bundle"
desc = "Fight the power with this frontline combatant kit, featuring armor and armaments commonly utilized by assault operative teams."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/metaops
cost = 23
-/datum/uplink_item/loadout_skyrat/bond
+/datum/uplink_item/bundles_tc/bond
name = "Classic Spy bundle"
desc = "Play the hero or the villain in a cheesy spy movie with this throwback kit to far less modern syndicate operatives."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/bond
cost = 20
-/datum/uplink_item/loadout_skyrat/darklord
+/datum/uplink_item/bundles_tc/darklord
name = "Dark Lord bundle"
desc = "Wield unlimited power with this extremely effective combative kit, guaranteed to give the user efficient staying potential in any confrontation."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/darklord
cost = 20
-/datum/uplink_item/loadout_skyrat/bee
+/datum/uplink_item/bundles_tc/bee
name = "Buzzy bundle"
desc = "Look bee-utiful in this extra specialized rapid attack kit, featuring unique armaments seen nowhere else and a bumble-y sense of style."
item = /obj/item/storage/box/syndie_kit/loadout/bee
cost = 20
-/datum/uplink_item/loadout_skyrat/cryomancer
+/datum/uplink_item/bundles_tc/cryomancer
name = "Mister Freeze bundle"
desc = "Make everybody chill out at the sight of your power with this absolutely snowy weapons kit. Also happens to be great for ice-related puns."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/cryomancer
cost = 20
-/datum/uplink_item/loadout_skyrat/doctordeath
+/datum/uplink_item/bundles_tc/doctordeath
name = "Doctor Death bundle"
desc = "Be your very own mad scientist with this toxic bundle! Warning, license void if poisons used on self. Read bottom of bag for more information."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/doctordeath
cost = 25
-/datum/uplink_item/loadout_skyrat/donkcoshill
+/datum/uplink_item/bundles_tc/donkcoshill
name = "Donk Co. Shill bundle"
desc = "Love Donk Pockets? Want to shill Donk Co. Toys? This bundle is for you! Contains some DonkSoft guns, a vending machine, restocking units, and a box of Donk Pockets."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/donkshillkit
cost = 10
-/datum/uplink_item/loadout_skyrat/downtownspecial
+/datum/uplink_item/bundles_tc/downtownspecial
name = "Downtown Special bundle"
desc = "Ayyy fuggedaboudit! This bundle contains everything to be your own one man mafioso. Including an icon of the Virgin Mary for your own authentic mafia nickname. Gang members not included."
item = /obj/item/storage/backpack/duffelbag/syndie/loadout/downtownspecial
cost = 25
-/datum/uplink_item/loadout_skyrat/ocelotfoxtrot
+/datum/uplink_item/bundles_tc/ocelotfoxtrot
name = "Snake Eater bundle"
desc = "A kit themed around one certain gun spinning cat. Includes his famous colt special, and personalised ammo."
item = /obj/item/storage/box/syndie_kit/loadout/ocelotfoxtrot
cost = 15
-/datum/uplink_item/loadout_skyrat/nt_impostor
+/datum/uplink_item/bundles_tc/nt_impostor
name = "Corporate Deceit bundle"
desc = "Don the identities of the most powerful men and women in Nanotrasen, and pull strings from the shadows as you please with this specialized kit."
item = /obj/item/storage/box/syndie_kit/loadout/nt_impostor
cost = 20
-/datum/uplink_item/loadout_skyrat/lasermanbundle
+/datum/uplink_item/bundles_tc/lasermanbundle
name = "Laserman bundle"
desc = "Themed after an infamous syndicate operative with a particular fighting style, this kit is both a fashionable throwback and a uniquely useful combative loadout."
item = /obj/item/storage/box/syndie_kit/loadout/lasermanbundle
diff --git a/modular_skyrat/modules/alerts/code/priority_announce.dm b/modular_skyrat/modules/alerts/code/priority_announce.dm
index 5d10b2a431d..b05a3502e2d 100644
--- a/modular_skyrat/modules/alerts/code/priority_announce.dm
+++ b/modular_skyrat/modules/alerts/code/priority_announce.dm
@@ -1,5 +1,5 @@
///Sends an announcement to all players and formats it accordingly. Use this for big bad shit.
-/proc/priority_announce(text, title = "", sound, type , sender_override, has_important_message)
+/proc/priority_announce(text, title = "", sound, type , sender_override, has_important_message, players)
if(!text)
return
@@ -18,6 +18,8 @@
else if(type == JOB_CAPTAIN)
announcement += "