cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-21 20:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #966 from Chemlight/Syndicate-Cold-War-on-Kinaris

Browse Source 
Syndicate stuff
This commit is contained in:
QuoteFox
2021-02-11 14:18:19 +00:00
committed by GitHub
parent 46c19f6302 d47af9c25c
commit 6f4cfdb360
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ruins/lavaland_ruin_code.dm
+4 -4
View File
@@ -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()
modular_citadel/code/game/machinery/cryopod.dm
+4 -1
View File
@@ -384,7 +384,10 @@
else if(target.mind.has_antag_datum(/datum/antagonist/rev))
alert("<span class='userdanger'>You're a Revolutionary![generic_plsnoleave_message]</span>")
caught = TRUE
if(target.mind.special_role == ROLE_TRAITOR)
alert("<span class='userdanger'>You're a Traitor![generic_plsnoleave_message]</span>")
caught = TRUE
if(caught)
target.client.cryo_warned = world.time
return