From d47af9c25c52f4f3adbc52d867640de39ba2830c Mon Sep 17 00:00:00 2001 From: Chemlight Date: Thu, 11 Feb 2021 05:50:58 -0800 Subject: [PATCH] Syndicate stuff Lets start if off right off the bat, chameleon masks from lavaland syndicate and (hopefully) space comms agents no longer have a GPS. Flavor text for the syndicate ghost roles more tie into a don't leave rather than abandon, while hinting Kinaris is also an enemy much like NT, just not that much of a threat (think cold war). Lastly anyone with the mind.special_role ROLE_TRAITOR will get a notification about ahelping before cryoing. --- code/modules/ruins/lavaland_ruin_code.dm | 8 ++++---- modular_citadel/code/game/machinery/cryopod.dm | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 3cd7d773..edf4f8bc 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -116,8 +116,8 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper_s" short_desc = "You are a syndicate agent, employed in a top secret research facility developing biological weapons plants and toys." - flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile." - important_info = "The base is rigged with explosives, DO NOT abandon it or let it fall into enemy hands!" + flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and Kinaris." //Making it more clear it's Nanotrasne AND Kinaris. + important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are. outfit = /datum/outfit/lavaland_syndicate assignedrole = "Lavaland Syndicate" mirrorcanloadappearance = TRUE @@ -147,7 +147,7 @@ job_description = "Off-station Syndicate Comms Agent" short_desc = "You are a syndicate comms agent, employed in a top secret research facility developing biological weapons." flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or Kinaris off your trail. Do not let the base fall into enemy hands!" - important_info = "The base is rigged with explosives, DO NOT abandon it or let it fall into enemy hands!" + important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are. outfit = /datum/outfit/lavaland_syndicate/comms mirrorcanloadappearance = TRUE @@ -160,7 +160,7 @@ /datum/outfit/lavaland_syndicate/comms name = "Lavaland Syndicate Comms Agent" r_hand = /obj/item/melee/transforming/energy/sword/saber - mask = /obj/item/clothing/mask/chameleon/gps + mask = /obj/item/clothing/mask/chameleon/ //Replaced from /obj/item/clothing/mask/chameleon/gps because shouldn't it be stealthy? suit = /obj/item/clothing/suit/armor/vest /obj/item/clothing/mask/chameleon/gps/Initialize() diff --git a/modular_citadel/code/game/machinery/cryopod.dm b/modular_citadel/code/game/machinery/cryopod.dm index c0818e90..0c82a210 100644 --- a/modular_citadel/code/game/machinery/cryopod.dm +++ b/modular_citadel/code/game/machinery/cryopod.dm @@ -384,7 +384,10 @@ else if(target.mind.has_antag_datum(/datum/antagonist/rev)) alert("You're a Revolutionary![generic_plsnoleave_message]") caught = TRUE - + if(target.mind.special_role == ROLE_TRAITOR) + alert("You're a Traitor![generic_plsnoleave_message]") + caught = TRUE + if(caught) target.client.cryo_warned = world.time return