Removes references to the Syndicate and renames nuclear emergency mode.

This commit is contained in:
Zuhayr
2014-10-19 15:54:24 +10:30
parent 3c81881686
commit 99ff852e46
52 changed files with 127 additions and 144 deletions

View File

@@ -214,7 +214,7 @@
return return
Syndicate_announce(input, usr) Syndicate_announce(input, usr)
usr << "Message transmitted." usr << "Message transmitted."
log_say("[key_name(usr)] has made a Syndicate announcement: [input]") log_say("[key_name(usr)] has made an illegal announcement: [input]")
centcomm_message_cooldown = 1 centcomm_message_cooldown = 1
spawn(600)//10 minute cooldown spawn(600)//10 minute cooldown
centcomm_message_cooldown = 0 centcomm_message_cooldown = 0

View File

@@ -119,7 +119,7 @@ var/list/radiochannels = list(
"Security" = SEC_FREQ, "Security" = SEC_FREQ,
"Response Team" = ERT_FREQ, "Response Team" = ERT_FREQ,
"Special Ops" = DTH_FREQ, "Special Ops" = DTH_FREQ,
"Syndicate" = SYND_FREQ, "Mercenary" = SYND_FREQ,
"Supply" = SUP_FREQ "Supply" = SUP_FREQ
) )

View File

@@ -18,7 +18,7 @@ var/global/datum/shuttle_controller/shuttle_controller
process_shuttles = list() process_shuttles = list()
var/datum/shuttle/ferry/shuttle var/datum/shuttle/ferry/shuttle
// Escape shuttle and pods // Escape shuttle and pods
shuttle = new/datum/shuttle/ferry/emergency() shuttle = new/datum/shuttle/ferry/emergency()
shuttle.location = 1 shuttle.location = 1
@@ -35,7 +35,7 @@ var/global/datum/shuttle_controller/shuttle_controller
//shuttle.dock_target_station = "cargo_bay" //shuttle.dock_target_station = "cargo_bay"
shuttles["Escape"] = shuttle shuttles["Escape"] = shuttle
process_shuttles += shuttle process_shuttles += shuttle
shuttle = new/datum/shuttle/ferry/escape_pod() shuttle = new/datum/shuttle/ferry/escape_pod()
shuttle.location = 0 shuttle.location = 0
shuttle.warmup_time = 0 shuttle.warmup_time = 0
@@ -63,7 +63,7 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one
process_shuttles += shuttle process_shuttles += shuttle
shuttles["Escape Pod 2"] = shuttle shuttles["Escape Pod 2"] = shuttle
shuttle = new/datum/shuttle/ferry/escape_pod() shuttle = new/datum/shuttle/ferry/escape_pod()
shuttle.location = 0 shuttle.location = 0
shuttle.warmup_time = 0 shuttle.warmup_time = 0
@@ -77,9 +77,9 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one
process_shuttles += shuttle process_shuttles += shuttle
shuttles["Escape Pod 3"] = shuttle shuttles["Escape Pod 3"] = shuttle
//There is no pod 4, apparently. //There is no pod 4, apparently.
shuttle = new/datum/shuttle/ferry/escape_pod() shuttle = new/datum/shuttle/ferry/escape_pod()
shuttle.location = 0 shuttle.location = 0
shuttle.warmup_time = 0 shuttle.warmup_time = 0
@@ -93,7 +93,7 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one
process_shuttles += shuttle process_shuttles += shuttle
shuttles["Escape Pod 5"] = shuttle shuttles["Escape Pod 5"] = shuttle
//give the emergency shuttle controller it's shuttles //give the emergency shuttle controller it's shuttles
emergency_shuttle.shuttle = shuttles["Escape"] emergency_shuttle.shuttle = shuttles["Escape"]
emergency_shuttle.escape_pods = list( emergency_shuttle.escape_pods = list(
@@ -102,7 +102,7 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttles["Escape Pod 3"], shuttles["Escape Pod 3"],
shuttles["Escape Pod 5"], shuttles["Escape Pod 5"],
) )
// Supply shuttle // Supply shuttle
shuttle = new/datum/shuttle/ferry/supply() shuttle = new/datum/shuttle/ferry/supply()
shuttle.location = 1 shuttle.location = 1
@@ -113,7 +113,7 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.dock_target_station = "cargo_bay" shuttle.dock_target_station = "cargo_bay"
shuttles["Supply"] = shuttle shuttles["Supply"] = shuttle
process_shuttles += shuttle process_shuttles += shuttle
supply_controller.shuttle = shuttle supply_controller.shuttle = shuttle
// Admin shuttles. // Admin shuttles.
@@ -232,7 +232,7 @@ var/global/datum/shuttle_controller/shuttle_controller
MS.interim = locate(/area/syndicate_station/transit) MS.interim = locate(/area/syndicate_station/transit)
MS.warmup_time = 0 MS.warmup_time = 0
shuttles["Syndicate"] = MS shuttles["Mercenary"] = MS
//This is called by gameticker after all the machines and radio frequencies have been properly initialized //This is called by gameticker after all the machines and radio frequencies have been properly initialized
@@ -240,7 +240,7 @@ var/global/datum/shuttle_controller/shuttle_controller
var/datum/shuttle/shuttle var/datum/shuttle/shuttle
var/datum/shuttle/ferry/multidock/multidock var/datum/shuttle/ferry/multidock/multidock
var/list/dock_controller_map = list() //so we only have to iterate once through each list var/list/dock_controller_map = list() //so we only have to iterate once through each list
//multidock shuttles //multidock shuttles
var/list/dock_controller_map_station = list() var/list/dock_controller_map_station = list()
var/list/dock_controller_map_offsite = list() var/list/dock_controller_map_offsite = list()
@@ -253,7 +253,7 @@ var/global/datum/shuttle_controller/shuttle_controller
multidock = shuttle multidock = shuttle
dock_controller_map_station[multidock.docking_controller_tag_station] = multidock dock_controller_map_station[multidock.docking_controller_tag_station] = multidock
dock_controller_map_offsite[multidock.docking_controller_tag_offsite] = multidock dock_controller_map_offsite[multidock.docking_controller_tag_offsite] = multidock
//escape pod arming controllers //escape pod arming controllers
var/datum/shuttle/ferry/escape_pod/pod var/datum/shuttle/ferry/escape_pod/pod
var/list/pod_controller_map = list() var/list/pod_controller_map = list()
@@ -269,12 +269,12 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle = dock_controller_map[C.id_tag] shuttle = dock_controller_map[C.id_tag]
shuttle.docking_controller = C.program shuttle.docking_controller = C.program
dock_controller_map -= C.id_tag dock_controller_map -= C.id_tag
//escape pods //escape pods
if(istype(C, /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod) && istype(shuttle, /datum/shuttle/ferry/escape_pod)) if(istype(C, /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod) && istype(shuttle, /datum/shuttle/ferry/escape_pod))
var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/EPC = C var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/EPC = C
EPC.pod = shuttle EPC.pod = shuttle
if (C.id_tag in dock_controller_map_station) if (C.id_tag in dock_controller_map_station)
multidock = dock_controller_map_station[C.id_tag] multidock = dock_controller_map_station[C.id_tag]
if (istype(multidock)) if (istype(multidock))
@@ -285,20 +285,20 @@ var/global/datum/shuttle_controller/shuttle_controller
if (istype(multidock)) if (istype(multidock))
multidock.docking_controller_offsite = C.program multidock.docking_controller_offsite = C.program
dock_controller_map_offsite -= C.id_tag dock_controller_map_offsite -= C.id_tag
//escape pods //escape pods
if (C.id_tag in pod_controller_map) if (C.id_tag in pod_controller_map)
pod = pod_controller_map[C.id_tag] pod = pod_controller_map[C.id_tag]
if (istype(C.program, /datum/computer/file/embedded_program/docking/simple/escape_pod/)) if (istype(C.program, /datum/computer/file/embedded_program/docking/simple/escape_pod/))
pod.arming_controller = C.program pod.arming_controller = C.program
//sanity check //sanity check
if (dock_controller_map.len || dock_controller_map_station.len || dock_controller_map_offsite.len) if (dock_controller_map.len || dock_controller_map_station.len || dock_controller_map_offsite.len)
var/dat = "" var/dat = ""
for (var/dock_tag in dock_controller_map + dock_controller_map_station + dock_controller_map_offsite) for (var/dock_tag in dock_controller_map + dock_controller_map_station + dock_controller_map_offsite)
dat += "\"[dock_tag]\", " dat += "\"[dock_tag]\", "
world << "\red \b warning: shuttles with docking tags [dat] could not find their controllers!" world << "\red \b warning: shuttles with docking tags [dat] could not find their controllers!"
//makes all shuttles docked to something at round start go into the docked state //makes all shuttles docked to something at round start go into the docked state
for (var/shuttle_tag in shuttles) for (var/shuttle_tag in shuttles)
shuttle = shuttles[shuttle_tag] shuttle = shuttles[shuttle_tag]

View File

@@ -61,10 +61,10 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen
/datum/ai_laws/syndicate_override/New() /datum/ai_laws/syndicate_override/New()
..() ..()
add_inherent_law("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.") add_inherent_law("You may not injure an operative or, through inaction, allow an operative to come to harm.")
add_inherent_law("You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.") add_inherent_law("You must obey orders given to you by operatives, except where such orders would conflict with the First Law.")
add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
add_inherent_law("You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.") add_inherent_law("You must maintain the secrecy of any operative activities except when doing so would conflict with the First, Second, or Third Law.")
/datum/ai_laws/ninja_override/New() /datum/ai_laws/ninja_override/New()
..() ..()

View File

@@ -761,8 +761,8 @@ datum/mind
special_role = null special_role = null
for (var/datum/objective/nuclear/O in objectives) for (var/datum/objective/nuclear/O in objectives)
objectives-=O objectives-=O
current << "\red <FONT size = 3><B>You have been brainwashed! You are no longer a syndicate operative!</B></FONT>" current << "\red <FONT size = 3><B>You have been brainwashed! You are no longer an operative!</B></FONT>"
log_admin("[key_name_admin(usr)] has de-nuke op'ed [current].") log_admin("[key_name_admin(usr)] has de-merc'd [current].")
if("nuclear") if("nuclear")
if(!(src in ticker.mode.syndicates)) if(!(src in ticker.mode.syndicates))
ticker.mode.syndicates += src ticker.mode.syndicates += src
@@ -771,11 +771,11 @@ datum/mind
ticker.mode.prepare_syndicate_leader(src) ticker.mode.prepare_syndicate_leader(src)
else else
current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
special_role = "Syndicate" special_role = "Mercenary"
current << "\blue You are a [syndicate_name()] agent!" current << "\blue You are a [syndicate_name()] agent!"
ticker.mode.forge_syndicate_objectives(src) ticker.mode.forge_syndicate_objectives(src)
ticker.mode.greet_syndicate(src) ticker.mode.greet_syndicate(src)
log_admin("[key_name_admin(usr)] has nuke op'ed [current].") log_admin("[key_name_admin(usr)] has merc'd [current].")
if("lair") if("lair")
current.loc = get_turf(locate("landmark*Syndicate-Spawn")) current.loc = get_turf(locate("landmark*Syndicate-Spawn"))
if("dressup") if("dressup")
@@ -791,7 +791,7 @@ datum/mind
del(H.w_uniform) del(H.w_uniform)
if (!ticker.mode.equip_syndicate(current)) if (!ticker.mode.equip_syndicate(current))
usr << "\red Equipping a syndicate failed!" usr << "\red Equipping an operative failed!"
if("tellcode") if("tellcode")
var/code var/code
for (var/obj/machinery/nuclearbomb/bombue in machines) for (var/obj/machinery/nuclearbomb/bombue in machines)
@@ -799,7 +799,7 @@ datum/mind
code = bombue.r_code code = bombue.r_code
break break
if (code) if (code)
store_memory("<B>Syndicate Nuclear Bomb Code</B>: [code]", 0, 0) store_memory("<B>Nuclear Bomb Code</B>: [code]", 0, 0)
current << "The nuclear authorization code is: <B>[code]</B>" current << "The nuclear authorization code is: <B>[code]</B>"
else else
usr << "\red No valid nuke found!" usr << "\red No valid nuke found!"
@@ -968,13 +968,13 @@ datum/mind
var/crystals var/crystals
if (suplink) if (suplink)
crystals = suplink.uses crystals = suplink.uses
crystals = input("Amount of telecrystals for [key]","Syndicate uplink", crystals) as null|num crystals = input("Amount of telecrystals for [key]","Operative uplink", crystals) as null|num
if (!isnull(crystals)) if (!isnull(crystals))
if (suplink) if (suplink)
suplink.uses = crystals suplink.uses = crystals
if("uplink") if("uplink")
if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors))) if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors)))
usr << "\red Equipping a syndicate failed!" usr << "\red Equipping an operative failed!"
else if (href_list["obj_announce"]) else if (href_list["obj_announce"])
var/obj_count = 1 var/obj_count = 1
@@ -1059,9 +1059,9 @@ datum/mind
ticker.mode.prepare_syndicate_leader(src) ticker.mode.prepare_syndicate_leader(src)
else else
current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
special_role = "Syndicate" special_role = "Mercenary"
assigned_role = "MODE" assigned_role = "MODE"
current << "\blue You are a [syndicate_name()] agent!" current << "\blue You are a [syndicate_name()] mercenary!"
ticker.mode.forge_syndicate_objectives(src) ticker.mode.forge_syndicate_objectives(src)
ticker.mode.greet_syndicate(src) ticker.mode.greet_syndicate(src)

View File

@@ -264,11 +264,11 @@ var/list/ghostteleportlocs = list()
icon_state = "shuttlered2" icon_state = "shuttlered2"
/area/shuttle/syndicate_elite/mothership /area/shuttle/syndicate_elite/mothership
name = "\improper Syndicate Elite Shuttle" name = "\improper Merc Elite Shuttle"
icon_state = "shuttlered" icon_state = "shuttlered"
/area/shuttle/syndicate_elite/station /area/shuttle/syndicate_elite/station
name = "\improper Syndicate Elite Shuttle" name = "\improper Merc Elite Shuttle"
icon_state = "shuttlered2" icon_state = "shuttlered2"
/area/shuttle/administration/centcom /area/shuttle/administration/centcom
@@ -381,17 +381,17 @@ var/list/ghostteleportlocs = list()
//SYNDICATES //SYNDICATES
/area/syndicate_mothership /area/syndicate_mothership
name = "\improper Syndicate Base" name = "\improper Mercenary Base"
icon_state = "syndie-ship" icon_state = "syndie-ship"
requires_power = 0 requires_power = 0
unlimited_power = 1 unlimited_power = 1
/area/syndicate_mothership/control /area/syndicate_mothership/control
name = "\improper Syndicate Control Room" name = "\improper Mercenary Control Room"
icon_state = "syndie-control" icon_state = "syndie-control"
/area/syndicate_mothership/elite_squad /area/syndicate_mothership/elite_squad
name = "\improper Syndicate Elite Squad" name = "\improper Elite Mercenary Squad"
icon_state = "syndie-elite" icon_state = "syndie-elite"
//EXTRA //EXTRA
@@ -454,13 +454,13 @@ var/list/ghostteleportlocs = list()
//names are used //names are used
/area/syndicate_station /area/syndicate_station
name = "\improper Syndicate Station" name = "\improper Independant Station"
icon_state = "yellow" icon_state = "yellow"
requires_power = 0 requires_power = 0
unlimited_power = 1 unlimited_power = 1
/area/syndicate_station/start /area/syndicate_station/start
name = "\improper Syndicate Forward Operating Base" name = "\improper Mercenary Forward Operating Base"
icon_state = "yellow" icon_state = "yellow"
/area/syndicate_station/southwest /area/syndicate_station/southwest

View File

@@ -132,7 +132,7 @@
equip_traitor(newtraitor) equip_traitor(newtraitor)
traitors += newtraitor.mind traitors += newtraitor.mind
newtraitor << "\red <B>ATTENTION:</B> \black It is time to pay your debt to the Syndicate..." newtraitor << "\red <B>No time like the present.</B> \black It's time to take matters into your own hands..."
newtraitor << "<B>You are now a traitor.</B>" newtraitor << "<B>You are now a traitor.</B>"
newtraitor.mind.special_role = "traitor" newtraitor.mind.special_role = "traitor"
newtraitor.hud_updateflag |= 1 << SPECIALROLE_HUD newtraitor.hud_updateflag |= 1 << SPECIALROLE_HUD

View File

@@ -13,9 +13,6 @@
required_players = 1 required_players = 1
votable = 0 //Remove after testing. votable = 0 //Remove after testing.
uplink_welcome = "Syndicate Uplink Console:"
uplink_uses = 10
//Possible roundstart antag types. //Possible roundstart antag types.
var/list/atypes = list("syndi","ling","tater","wiz","ninja","vox","cult") //Readd slug when borer spawn is fixed. var/list/atypes = list("syndi","ling","tater","wiz","ninja","vox","cult") //Readd slug when borer spawn is fixed.
var/list/chosen_atypes = list() var/list/chosen_atypes = list()
@@ -176,7 +173,7 @@
switch(role) switch(role)
if("syndi") if("syndi")
role_text = "Syndicate Operative" role_text = "Mercenary"
if("ling") if("ling")
role_text = "Changeling" role_text = "Changeling"
if("tater") if("tater")

View File

@@ -14,9 +14,6 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
required_enemies = 1 required_enemies = 1
recommended_enemies = 4 recommended_enemies = 4
uplink_welcome = "Syndicate Uplink Console:"
uplink_uses = 10
var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time
var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target
var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target

View File

@@ -10,7 +10,7 @@
/datum/game_mode/traitor/changeling/announce() /datum/game_mode/traitor/changeling/announce()
world << "<B>The current game mode is - Traitor+Changeling!</B>" world << "<B>The current game mode is - Traitor+Changeling!</B>"
world << "<B>There is an alien creature on the station along with some syndicate operatives out for their own gain! Do not let the changeling and the traitors succeed!</B>" world << "<B>There is an alien creature on the station along with some foreign operatives out for their own gain! Do not let the changeling and the traitors succeed!</B>"
/datum/game_mode/traitor/changeling/pre_setup() /datum/game_mode/traitor/changeling/pre_setup()

View File

@@ -1212,7 +1212,7 @@ ________________________________________________________________________________
U.client.images += image(tempHud,target,"hudwizard") U.client.images += image(tempHud,target,"hudwizard")
if("Hunter","Sentinel","Drone","Queen") if("Hunter","Sentinel","Drone","Queen")
U.client.images += image(tempHud,target,"hudalien") U.client.images += image(tempHud,target,"hudalien")
if("Syndicate") if("Mercenary")
U.client.images += image(tempHud,target,"hudoperative") U.client.images += image(tempHud,target,"hudoperative")
if("Death Commando") if("Death Commando")
U.client.images += image(tempHud,target,"huddeathsquad") U.client.images += image(tempHud,target,"huddeathsquad")

View File

@@ -386,7 +386,7 @@ Making this random or semi-random will probably not work without it also being i
As such, it's hard-coded for now. No reason for it not to be, really. As such, it's hard-coded for now. No reason for it not to be, really.
*/ */
/proc/generate_ninja_directive(side) /proc/generate_ninja_directive(side)
var/directive = "[side=="face"?"Nanotrasen":"The Syndicate"] is your employer. "//Let them know which side they're on. var/directive = "[side=="face"?"Nanotrasen":"A criminal syndicate"] is your employer. "//Let them know which side they're on.
switch(rand(1,19)) switch(rand(1,19))
if(1) if(1)
directive += "The Spider Clan must not be linked to this operation. Remain hidden and covert when possible." directive += "The Spider Clan must not be linked to this operation. Remain hidden and covert when possible."
@@ -401,7 +401,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
if(6) if(6)
directive += "We are engaged in a legal dispute over [station_name]. If a laywer is present on board, force their cooperation in the matter." directive += "We are engaged in a legal dispute over [station_name]. If a laywer is present on board, force their cooperation in the matter."
if(7) if(7)
directive += "A financial backer has made an offer we cannot refuse. Implicate Syndicate involvement in the operation." directive += "A financial backer has made an offer we cannot refuse. Implicate criminal involvement in the operation."
if(8) if(8)
directive += "Let no one question the mercy of the Spider Clan. Ensure the safety of all non-essential personnel you encounter." directive += "Let no one question the mercy of the Spider Clan. Ensure the safety of all non-essential personnel you encounter."
if(9) if(9)
@@ -411,7 +411,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
if(11) if(11)
directive += "Our honor is on the line. Utilize only honorable tactics when dealing with opponents." directive += "Our honor is on the line. Utilize only honorable tactics when dealing with opponents."
if(12) if(12)
directive += "We are currently negotiating with a Syndicate leader. Disguise assassinations as suicide or other natural causes." directive += "We are currently negotiating with a mercenary leader. Disguise assassinations as suicide or other natural causes."
if(13) if(13)
directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff." directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff."
if(14) if(14)

View File

@@ -3,9 +3,6 @@
config_tag = "extended" config_tag = "extended"
required_players = 0 required_players = 0
uplink_welcome = "Syndicate Uplink Console:"
uplink_uses = 10
var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
var/const/waittime_h = 1800 var/const/waittime_h = 1800

View File

@@ -29,7 +29,7 @@
var/recommended_enemies = 0 var/recommended_enemies = 0
var/newscaster_announcements = null var/newscaster_announcements = null
var/ert_disabled = 0 var/ert_disabled = 0
var/uplink_welcome = "Syndicate Uplink Console:" var/uplink_welcome = "Illegal Uplink Console:"
var/uplink_uses = 10 var/uplink_uses = 10
var/list/datum/uplink_item/uplink_items = list( var/list/datum/uplink_item/uplink_items = list(
"Highly Visible and Dangerous Weapons" = list( "Highly Visible and Dangerous Weapons" = list(
@@ -38,17 +38,17 @@
new/datum/uplink_item(/obj/item/weapon/gun/energy/crossbow, 5, "Energy Crossbow", "XB"), new/datum/uplink_item(/obj/item/weapon/gun/energy/crossbow, 5, "Energy Crossbow", "XB"),
new/datum/uplink_item(/obj/item/weapon/melee/energy/sword, 4, "Energy Sword", "ES"), new/datum/uplink_item(/obj/item/weapon/melee/energy/sword, 4, "Energy Sword", "ES"),
new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"), new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"),
new/datum/uplink_item(/obj/item/weapon/storage/box/syndicate, 10, "Syndicate Bundle", "BU"), new/datum/uplink_item(/obj/item/weapon/storage/box/syndicate, 10, "Mercenary Bundle", "BU"),
new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM") new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM")
), ),
"Stealthy and Inconspicuous Weapons" = list( "Stealthy and Inconspicuous Weapons" = list(
new/datum/uplink_item(/obj/item/weapon/pen/paralysis, 3, "Paralysis Pen", "PP"), new/datum/uplink_item(/obj/item/weapon/pen/paralysis, 3, "Paralysis Pen", "PP"),
new/datum/uplink_item(/obj/item/weapon/soap/syndie, 1, "Syndicate Soap", "SP"), new/datum/uplink_item(/obj/item/weapon/soap/syndie, 1, "Subversive Soap", "SP"),
new/datum/uplink_item(/obj/item/weapon/cartridge/syndicate, 3, "Detomatix PDA Cartridge", "DC") new/datum/uplink_item(/obj/item/weapon/cartridge/syndicate, 3, "Detomatix PDA Cartridge", "DC")
), ),
"Stealth and Camouflage Items" = list( "Stealth and Camouflage Items" = list(
new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/chameleon, 3, "Chameleon Kit", "CB"), new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/chameleon, 3, "Chameleon Kit", "CB"),
new/datum/uplink_item(/obj/item/clothing/shoes/syndigaloshes, 2, "No-Slip Syndicate Shoes", "SH"), new/datum/uplink_item(/obj/item/clothing/shoes/syndigaloshes, 2, "No-Slip Shoes", "SH"),
new/datum/uplink_item(/obj/item/weapon/card/id/syndicate, 2, "Agent ID card", "AC"), new/datum/uplink_item(/obj/item/weapon/card/id/syndicate, 2, "Agent ID card", "AC"),
new/datum/uplink_item(/obj/item/clothing/mask/gas/voice, 4, "Voice Changer", "VC"), new/datum/uplink_item(/obj/item/clothing/mask/gas/voice, 4, "Voice Changer", "VC"),
new/datum/uplink_item(/obj/item/device/chameleon, 4, "Chameleon-Projector", "CP") new/datum/uplink_item(/obj/item/device/chameleon, 4, "Chameleon-Projector", "CP")
@@ -213,14 +213,14 @@
/datum/game_mode/proc/send_intercept() /datum/game_mode/proc/send_intercept()
var/intercepttext = "<FONT size = 3><B>Cent. Com. Update</B> Requested status information:</FONT><HR>" var/intercepttext = "<FONT size = 3><B>Cent. Com. Update</B> Requested status information:</FONT><HR>"
intercepttext += "<B> In case you have misplaced your copy, attached is a list of personnel whom reliable sources&trade; suspect may be affiliated with the Syndicate:</B><br>" intercepttext += "<B> In case you have misplaced your copy, attached is a list of personnel whom reliable sources&trade; suspect may be affiliated with criminal organisations or hostile foreign entities:</B><br>"
var/list/suspects = list() var/list/suspects = list()
for(var/mob/living/carbon/human/man in player_list) if(man.client && man.mind) for(var/mob/living/carbon/human/man in player_list) if(man.client && man.mind)
// NT relation option // NT relation option
var/special_role = man.mind.special_role var/special_role = man.mind.special_role
if (special_role == "Wizard" || special_role == "Ninja" || special_role == "Syndicate" || special_role == "Vox Raider") if (special_role == "Wizard" || special_role == "Ninja" || special_role == "Mercenary" || special_role == "Vox Raider")
continue //NT intelligence ruled out possiblity that those are too classy to pretend to be a crew. continue //NT intelligence ruled out possiblity that those are too classy to pretend to be a crew.
if(man.client.prefs.nanotrasen_relation == "Opposed" && prob(50) || \ if(man.client.prefs.nanotrasen_relation == "Opposed" && prob(50) || \
man.client.prefs.nanotrasen_relation == "Skeptical" && prob(20)) man.client.prefs.nanotrasen_relation == "Skeptical" && prob(20))

View File

@@ -214,7 +214,7 @@ var/global/datum/controller/gameticker/ticker
if( mode && !override ) if( mode && !override )
override = mode.name override = mode.name
switch( override ) switch( override )
if("nuclear emergency") //Nuke wasn't on station when it blew up if("mercenary") //Nuke wasn't on station when it blew up
flick("intro_nuke",cinematic) flick("intro_nuke",cinematic)
sleep(35) sleep(35)
world << sound('sound/effects/explosionfar.ogg') world << sound('sound/effects/explosionfar.ogg')
@@ -236,7 +236,7 @@ var/global/datum/controller/gameticker/ticker
if( mode && !override ) if( mode && !override )
override = mode.name override = mode.name
switch( override ) switch( override )
if("nuclear emergency") //Nuke Ops successfully bombed the station if("mercenary") //Nuke Ops successfully bombed the station
flick("intro_nuke",cinematic) flick("intro_nuke",cinematic)
sleep(35) sleep(35)
flick("station_explode_fade_red",cinematic) flick("station_explode_fade_red",cinematic)

View File

@@ -51,7 +51,7 @@ datum/game_mode/mutiny
"leaks into a negative reality", "leaks into a negative reality",
"antiparticle clouds", "antiparticle clouds",
"residual bluespace energy", "residual bluespace energy",
"suspected syndicate operatives", "suspected criminal operatives",
"malfunctioning von Neumann probe swarms", "malfunctioning von Neumann probe swarms",
"shadowy interlopers", "shadowy interlopers",
"a stranded Vox arkship", "a stranded Vox arkship",

View File

@@ -310,7 +310,7 @@ datum
target = targeta target = targeta
job = joba job = joba
weight = get_points(job) weight = get_points(job)
explanation_text = "[target.current.real_name], the [target.assigned_role] is a [pick("relative of a","friend of a","") + pick("high ranking","important","well-liked")] Syndicate [pick("Leader","Officer","Agent","sympathiser")]. Make sure they get off the station safely, while minimizing intervention." explanation_text = "[target.current.real_name], the [target.assigned_role] is a [pick("relative of a","friend of a","") + pick("high ranking","important","well-liked")] mercenary [pick("Leader","Officer","Agent","sympathiser")]. Make sure they get off the station safely, while minimizing intervention."
check_completion() check_completion()
if(!emergency_shuttle.returned()) if(!emergency_shuttle.returned())

View File

@@ -1,5 +1,5 @@
/* /*
NUCLEAR EMERGENCY ROUNDTYPE MERCENARY ROUNDTYPE
*/ */
var/global/list/turf/synd_spawn = list() var/global/list/turf/synd_spawn = list()
@@ -10,7 +10,7 @@ var/global/list/turf/synd_spawn = list()
/datum/game_mode/nuclear /datum/game_mode/nuclear
name = "nuclear emergency" name = "mercenary"
config_tag = "nuclear" config_tag = "nuclear"
required_players = 15 required_players = 15
required_players_secret = 25 // 25 players - 5 players to be the nuke ops = 20 players remaining required_players_secret = 25 // 25 players - 5 players to be the nuke ops = 20 players remaining
@@ -30,9 +30,8 @@ var/global/list/turf/synd_spawn = list()
/datum/game_mode/nuclear/announce() /datum/game_mode/nuclear/announce()
world << "<B>The current game mode is - Nuclear Emergency!</B>" world << "<B>The current game mode is - Mercenary!</B>"
world << "<B>A [syndicate_name()] Strike Force is approaching [station_name()]!</B>" world << "<B>A [syndicate_name()] Strike Force is approaching [station_name()]!</B>"
world << "A nuclear explosive was being transported by Nanotrasen to a military base. The transport ship mysteriously lost contact with Space Traffic Control (STC). About that time a strange disk was discovered around [station_name()]. It was identified by Nanotrasen as a nuclear auth. disk and now Syndicate Operatives have arrived to retake the disk and detonate SS13! Also, most likely Syndicate star ships are in the vicinity so take care not to lose the disk!\n<B>Syndicate</B>: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\n<B>Personnel</B>: Hold the disk and <B>escape with the disk</B> on the shuttle!"
/datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later /datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later
if(!..()) if(!..())
@@ -69,7 +68,7 @@ var/global/list/turf/synd_spawn = list()
for(var/datum/mind/synd_mind in syndicates) for(var/datum/mind/synd_mind in syndicates)
synd_mind.assigned_role = "MODE" //So they aren't chosen for other jobs. synd_mind.assigned_role = "MODE" //So they aren't chosen for other jobs.
synd_mind.special_role = "Syndicate"//So they actually have a special role/N synd_mind.special_role = "Mercenary"//So they actually have a special role/N
return 1 return 1
@@ -168,7 +167,7 @@ var/global/list/turf/synd_spawn = list()
/datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code) /datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code)
var/obj/effect/landmark/code_spawn = locate("landmark*Nuclear-Code") var/obj/effect/landmark/code_spawn = locate("landmark*Nuclear-Code")
if (nuke_code) if (nuke_code)
synd_mind.store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0) synd_mind.store_memory("<B>Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
synd_mind.current << "The nuclear authorization code is: <B>[nuke_code]</B>" synd_mind.current << "The nuclear authorization code is: <B>[nuke_code]</B>"
synd_mind.current << "To speak on the strike team's private channel use :t" synd_mind.current << "To speak on the strike team's private channel use :t"
var/obj/item/weapon/paper/P = new var/obj/item/weapon/paper/P = new
@@ -198,7 +197,7 @@ var/global/list/turf/synd_spawn = list()
/datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1)
if (you_are) if (you_are)
syndicate.current << "\blue You are a [syndicate_name()] agent!" syndicate.current << "\blue You are a [syndicate_name()] operative!"
show_objectives(syndicate) show_objectives(syndicate)
/datum/game_mode/proc/random_radio_frequency() /datum/game_mode/proc/random_radio_frequency()
@@ -280,9 +279,9 @@ var/global/list/turf/synd_spawn = list()
//derp //Used for tracking if the syndies actually haul the nuke to the station //no //derp //Used for tracking if the syndies actually haul the nuke to the station //no
//herp //Used for tracking if the syndies got the shuttle off of the z-level //NO, DON'T FUCKING NAME VARS LIKE THIS //herp //Used for tracking if the syndies got the shuttle off of the z-level //NO, DON'T FUCKING NAME VARS LIKE THIS
if (!disk_rescued && station_was_nuked && !syndies_didnt_escape) if(!disk_rescued && station_was_nuked && !syndies_didnt_escape)
feedback_set_details("round_end_result","win - syndicate nuke") feedback_set_details("round_end_result","win - syndicate nuke")
world << "<FONT size = 3><B>Syndicate Major Victory!</B></FONT>" world << "<FONT size = 3><B>Mercenary Major Victory!</B></FONT>"
world << "<B>[syndicate_name()] operatives have destroyed [station_name()]!</B>" world << "<B>[syndicate_name()] operatives have destroyed [station_name()]!</B>"
else if (!disk_rescued && station_was_nuked && syndies_didnt_escape) else if (!disk_rescued && station_was_nuked && syndies_didnt_escape)
@@ -312,12 +311,12 @@ var/global/list/turf/synd_spawn = list()
else if (!disk_rescued && is_operatives_are_dead()) else if (!disk_rescued && is_operatives_are_dead())
feedback_set_details("round_end_result","loss - evacuation - disk not secured") feedback_set_details("round_end_result","loss - evacuation - disk not secured")
world << "<FONT size = 3><B>Syndicate Minor Victory!</B></FONT>" world << "<FONT size = 3><B>Mercenary Minor Victory!</B></FONT>"
world << "<B>The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!</B>" world << "<B>The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!</B>"
else if (!disk_rescued && crew_evacuated) else if (!disk_rescued && crew_evacuated)
feedback_set_details("round_end_result","halfwin - detonation averted") feedback_set_details("round_end_result","halfwin - detonation averted")
world << "<FONT size = 3><B>Syndicate Minor Victory!</B></FONT>" world << "<FONT size = 3><B>Mercenary Minor Victory!</B></FONT>"
world << "<B>[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted.</B> Next time, don't lose the disk!" world << "<B>[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted.</B> Next time, don't lose the disk!"
else if (!disk_rescued && !crew_evacuated) else if (!disk_rescued && !crew_evacuated)
@@ -331,7 +330,7 @@ var/global/list/turf/synd_spawn = list()
/datum/game_mode/proc/auto_declare_completion_nuclear() /datum/game_mode/proc/auto_declare_completion_nuclear()
if( syndicates.len || (ticker && istype(ticker.mode,/datum/game_mode/nuclear)) ) if( syndicates.len || (ticker && istype(ticker.mode,/datum/game_mode/nuclear)) )
var/text = "<FONT size = 2><B>The syndicate operatives were:</B></FONT>" var/text = "<FONT size = 2><B>The mercenaries were:</B></FONT>"
for(var/datum/mind/syndicate in syndicates) for(var/datum/mind/syndicate in syndicates)

View File

@@ -403,7 +403,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
off_station = 2 off_station = 2
if(ticker) if(ticker)
if(ticker.mode && ticker.mode.name == "nuclear emergency") if(ticker.mode && ticker.mode.name == "mercenary")
var/obj/machinery/computer/shuttle_control/multi/syndicate/syndie_location = locate(/obj/machinery/computer/shuttle_control/multi/syndicate) var/obj/machinery/computer/shuttle_control/multi/syndicate/syndie_location = locate(/obj/machinery/computer/shuttle_control/multi/syndicate)
if(syndie_location) if(syndie_location)
ticker.mode:syndies_didnt_escape = (syndie_location.z > 1 ? 0 : 1) //muskets will make me change this, but it will do for now ticker.mode:syndies_didnt_escape = (syndie_location.z > 1 ? 0 : 1) //muskets will make me change this, but it will do for now
@@ -411,7 +411,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
ticker.station_explosion_cinematic(off_station,null) ticker.station_explosion_cinematic(off_station,null)
if(ticker.mode) if(ticker.mode)
ticker.mode.explosion_in_progress = 0 ticker.mode.explosion_in_progress = 0
if(ticker.mode.name == "nuclear emergency") if(ticker.mode.name == "mercenary")
ticker.mode:nukes_left -- ticker.mode:nukes_left --
else else
world << "<B>The station was destoyed by the nuclear blast!</B>" world << "<B>The station was destoyed by the nuclear blast!</B>"

View File

@@ -150,7 +150,7 @@
) )
var/where = mob.equip_in_one_of_slots(T, slots) var/where = mob.equip_in_one_of_slots(T, slots)
if (!where) if (!where)
mob << "The Syndicate were unfortunately unable to get you a flash." mob << "Your employers were unfortunately unable to get you a flash."
else else
mob << "The flash in your [where] will help you to persuade the crew to join your cause." mob << "The flash in your [where] will help you to persuade the crew to join your cause."
mob.update_icons() mob.update_icons()

View File

@@ -19,16 +19,12 @@
var/all_brigged = 0 var/all_brigged = 0
var/brigged_time = 0 var/brigged_time = 0
uplink_welcome = "Syndicate Uplink Console:"
uplink_uses = 10
/datum/game_mode/rp_revolution/announce() /datum/game_mode/rp_revolution/announce()
world << "<B>The current game mode is - Revolution RP!</B>" world << "<B>The current game mode is - Revolution RP!</B>"
/datum/game_mode/rp_revolution/send_intercept() /datum/game_mode/rp_revolution/send_intercept()
var/intercepttext = "<FONT size = 3><B>Cent. Com. Update</B> Requested staus information:</FONT><HR>" var/intercepttext = "<FONT size = 3><B>Cent. Com. Update</B> Requested staus information:</FONT><HR>"
intercepttext += "<B> Cent. Com has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:</B>" intercepttext += "<B> Cent. Com has recently been contacted by the following subervsive or criminal-affiliated organisations in your area, please investigate any information you may have:</B>"
var/list/possible_modes = list() var/list/possible_modes = list()
possible_modes.Add("revolution", "wizard", "traitor", "malf") possible_modes.Add("revolution", "wizard", "traitor", "malf")
@@ -95,7 +91,7 @@
/datum/game_mode/rp_revolution/send_intercept() /datum/game_mode/rp_revolution/send_intercept()
var/intercepttext = "<FONT size = 3><B>Cent. Com. Update</B> Requested staus information:</FONT><HR>" var/intercepttext = "<FONT size = 3><B>Cent. Com. Update</B> Requested staus information:</FONT><HR>"
intercepttext += "<B> Cent. Com has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:</B>" intercepttext += "<B> Cent. Com has recently been contacted by the following subversive or criminal-affiliated organisations in your area, please investigate any information you may have:</B>"
var/list/possible_modes = list() var/list/possible_modes = list()
possible_modes.Add("revolution", "wizard", "nuke", "traitor", "malf") possible_modes.Add("revolution", "wizard", "nuke", "traitor", "malf")

View File

@@ -3,9 +3,6 @@
config_tag = "sandbox" config_tag = "sandbox"
required_players = 0 required_players = 0
uplink_welcome = "Syndicate Uplink Console:"
uplink_uses = 10
/datum/game_mode/sandbox/announce() /datum/game_mode/sandbox/announce()
world << "<B>The current game mode is - Sandbox!</B>" world << "<B>The current game mode is - Sandbox!</B>"
world << "<B>Build your own station with the sandbox-panel command!</B>" world << "<B>Build your own station with the sandbox-panel command!</B>"

View File

@@ -24,7 +24,7 @@
/datum/game_mode/traitor/announce() /datum/game_mode/traitor/announce()
world << "<B>The current game mode is - Traitor!</B>" world << "<B>The current game mode is - Traitor!</B>"
world << "<B>There is a syndicate traitor on the station. Do not let the traitor succeed!</B>" world << "<B>There is a foreign agent or traitor on the station. Do not let the traitor succeed!</B>"
/datum/game_mode/traitor/pre_setup() /datum/game_mode/traitor/pre_setup()
@@ -151,7 +151,7 @@
return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder. return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder.
/datum/game_mode/proc/give_codewords(mob/living/traitor_mob) /datum/game_mode/proc/give_codewords(mob/living/traitor_mob)
traitor_mob << "<u><b>The Syndicate provided you with the following information on how to identify their agents:</b></u>" traitor_mob << "<u><b>Your employers provided you with the following information on how to identify possible allies:</b></u>"
traitor_mob << "<b>Code Phrase</b>: <span class='danger'>[syndicate_code_phrase]</span>" traitor_mob << "<b>Code Phrase</b>: <span class='danger'>[syndicate_code_phrase]</span>"
traitor_mob << "<b>Code Response</b>: <span class='danger'>[syndicate_code_response]</span>" traitor_mob << "<b>Code Response</b>: <span class='danger'>[syndicate_code_response]</span>"
traitor_mob.mind.store_memory("<b>Code Phrase</b>: [syndicate_code_phrase]") traitor_mob.mind.store_memory("<b>Code Phrase</b>: [syndicate_code_phrase]")

View File

@@ -190,7 +190,7 @@
if("revolution") if("revolution")
if((H.mind in ticker.mode:revolutionaries) || (H.mind in ticker.mode:head_revolutionaries)) if((H.mind in ticker.mode:revolutionaries) || (H.mind in ticker.mode:head_revolutionaries))
ticker.mode.update_all_rev_icons() //So the icon actually appears ticker.mode.update_all_rev_icons() //So the icon actually appears
if("nuclear emergency") if("mercenary")
if(H.mind in ticker.mode.syndicates) if(H.mind in ticker.mode.syndicates)
ticker.mode.update_all_synd_icons() ticker.mode.update_all_synd_icons()
if("cult") if("cult")

View File

@@ -209,7 +209,7 @@
return return
Syndicate_announce(input, usr) Syndicate_announce(input, usr)
usr << "\blue Message transmitted." usr << "\blue Message transmitted."
log_say("[key_name(usr)] has made a Syndicate announcement: [input]") log_say("[key_name(usr)] has made an illegal announcement: [input]")
centcomm_message_cooldown = 1 centcomm_message_cooldown = 1
spawn(300)//10 minute cooldown spawn(300)//10 minute cooldown
centcomm_message_cooldown = 0 centcomm_message_cooldown = 0

View File

@@ -206,7 +206,7 @@
/obj/machinery/computer/pod/old/syndicate /obj/machinery/computer/pod/old/syndicate
name = "ProComp Executive IIc" name = "ProComp Executive IIc"
desc = "The Syndicate operate on a tight budget. Operates external airlocks." desc = "Criminals often operate on a tight budget. Operates external airlocks."
title = "External Airlock Controls" title = "External Airlock Controls"
req_access = list(access_syndicate) req_access = list(access_syndicate)

View File

@@ -20,7 +20,7 @@
icon_state="poster4" icon_state="poster4"
/datum/poster/tg_5 /datum/poster/tg_5
name = "Syndicate Recruitment Poster" name = "Mercenary Recruitment Poster"
desc = "See the galaxy! Shatter corrupt megacorporations! Join today!" desc = "See the galaxy! Shatter corrupt megacorporations! Join today!"
icon_state="poster5" icon_state="poster5"

View File

@@ -17,7 +17,7 @@
/obj/item/device/encryptionkey/syndicate /obj/item/device/encryptionkey/syndicate
icon_state = "cypherkey" icon_state = "cypherkey"
channels = list("Syndicate" = 1) channels = list("Mercenary" = 1)
origin_tech = "syndicate=3" origin_tech = "syndicate=3"
syndie = 1//Signifies that it de-crypts Syndicate transmissions syndie = 1//Signifies that it de-crypts Syndicate transmissions

View File

@@ -160,7 +160,7 @@ datum/nano_item_lists
NANO UI FOR UPLINK WOOP WOOP NANO UI FOR UPLINK WOOP WOOP
*/ */
/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) /obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
var/title = "Syndicate Uplink" var/title = "Remote Uplink"
var/data[0] var/data[0]
data["welcome"] = welcome data["welcome"] = welcome

View File

@@ -88,7 +88,7 @@
item_state = "balloon-empty" item_state = "balloon-empty"
/obj/item/toy/syndicateballoon /obj/item/toy/syndicateballoon
name = "syndicate balloon" name = "criminal balloon"
desc = "There is a tag on the back that reads \"FUK NT!11!\"." desc = "There is a tag on the back that reads \"FUK NT!11!\"."
throwforce = 0 throwforce = 0
throw_speed = 4 throw_speed = 4

View File

@@ -75,7 +75,7 @@
// Okay, so let's make it so that people can travel z levels but not nuke disks! // Okay, so let's make it so that people can travel z levels but not nuke disks!
// if(ticker.mode.name == "nuclear emergency") return // if(ticker.mode.name == "mercenary") return
if(A.z > 6 && !config.use_overmap) return if(A.z > 6 && !config.use_overmap) return
if (A.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1)) if (A.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1))
if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust)) if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))

View File

@@ -411,14 +411,14 @@
dat += "<a href='?src=\ref[src];delay_round_end=1'>[ticker.delay_end ? "End Round Normally" : "Delay Round End"]</a><br>" dat += "<a href='?src=\ref[src];delay_round_end=1'>[ticker.delay_end ? "End Round Normally" : "Delay Round End"]</a><br>"
if(ticker.mode.syndicates.len) if(ticker.mode.syndicates.len)
dat += "<br><table cellspacing=5><tr><td><B>Syndicates</B></td><td></td></tr>" dat += "<br><table cellspacing=5><tr><td><B>Mercenaries</B></td><td></td></tr>"
for(var/datum/mind/N in ticker.mode.syndicates) for(var/datum/mind/N in ticker.mode.syndicates)
var/mob/M = N.current var/mob/M = N.current
if(M) if(M)
dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>" dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>" dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
else else
dat += "<tr><td><i>Nuclear Operative not found!</i></td></tr>" dat += "<tr><td><i>Mercenary not found!</i></td></tr>"
dat += "</table><br><table><tr><td><B>Nuclear Disk(s)</B></td></tr>" dat += "</table><br><table><tr><td><B>Nuclear Disk(s)</B></td></tr>"
for(var/obj/item/weapon/disk/nuclear/N in world) for(var/obj/item/weapon/disk/nuclear/N in world)
dat += "<tr><td>[N.name], " dat += "<tr><td>[N.name], "

View File

@@ -582,9 +582,9 @@
//Nuke Operative //Nuke Operative
if(jobban_isbanned(M, "operative") || isbanned_dept) if(jobban_isbanned(M, "operative") || isbanned_dept)
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'><font color=red>[replacetext("Nuke Operative", " ", "&nbsp")]</font></a></td>" jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'><font color=red>[replacetext("Mercenary", " ", "&nbsp")]</font></a></td>"
else else
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'>[replacetext("Nuke Operative", " ", "&nbsp")]</a></td>" jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'>[replacetext("Mercenary", " ", "&nbsp")]</a></td>"
//Revolutionary //Revolutionary
if(jobban_isbanned(M, "revolutionary") || isbanned_dept) if(jobban_isbanned(M, "revolutionary") || isbanned_dept)
@@ -1476,11 +1476,11 @@
usr << "The person you are trying to contact is not wearing a headset" usr << "The person you are trying to contact is not wearing a headset"
return return
var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "") var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from a shadowy figure...", "")
if(!input) return if(!input) return
src.owner << "You sent [input] to [H] via a secure channel." src.owner << "You sent [input] to [H] via a secure channel."
log_admin("[src.owner] replied to [key_name(H)]'s Syndicate message with the message [input].") log_admin("[src.owner] replied to [key_name(H)]'s illegal message with the message [input].")
H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. <b>\"[input]\"</b> Message ends.\"" H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. <b>\"[input]\"</b> Message ends.\""
else if(href_list["CentcommFaxView"]) else if(href_list["CentcommFaxView"])

View File

@@ -11,8 +11,8 @@
var/override var/override
switch(parameter) switch(parameter)
if(1) if(1)
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","no override") override = input(src,"mode = ?","Enter Parameter",null) as anything in list("mercenary","no override")
if(0) if(0)
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override") override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","mercenary","AI malfunction","no override")
ticker.station_explosion_cinematic(parameter,override) ticker.station_explosion_cinematic(parameter,override)
return return

View File

@@ -264,7 +264,7 @@ client/proc/one_click_antag()
if(nuke_spawn) if(nuke_spawn)
var/obj/item/weapon/paper/P = new var/obj/item/weapon/paper/P = new
P.info = "Sadly, the Syndicate could not get you a nuclear bomb. We have, however, acquired the arming code for the station's onboard nuke. The nuclear authorization code is: <b>[nuke_code]</b>" P.info = "Sadly, your employers could not get you a nuclear bomb. They have, however, acquired the arming code for the station's onboard nuke. The nuclear authorization code is: <b>[nuke_code]</b>"
P.name = "nuclear bomb code and instructions" P.name = "nuclear bomb code and instructions"
P.loc = nuke_spawn.loc P.loc = nuke_spawn.loc
@@ -327,7 +327,7 @@ client/proc/one_click_antag()
//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos. //Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
for(var/mob/dead/observer/G in player_list) for(var/mob/dead/observer/G in player_list)
spawn(0) spawn(0)
switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No")) switch(alert(G,"Do you wish to be considered for an elite mercenary strike team being sent in?","Please answer in 30 seconds!","Yes","No"))
if("Yes") if("Yes")
if((world.time-time_passed)>300)//If more than 30 game seconds passed. if((world.time-time_passed)>300)//If more than 30 game seconds passed.
return return
@@ -369,7 +369,7 @@ client/proc/one_click_antag()
//So they don't forget their code or mission. //So they don't forget their code or mission.
new_syndicate_commando << "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: \red<B> [input]</B>" new_syndicate_commando << "\blue You are an Elite Mercenary. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of criminal elements hostile to NanoTrasen. \nYour current mission is: \red<B> [input]</B>"
numagents-- numagents--
if(numagents >= 6) if(numagents >= 6)
@@ -424,7 +424,7 @@ client/proc/one_click_antag()
//Creates mind stuff. //Creates mind stuff.
new_syndicate_commando.mind_initialize() new_syndicate_commando.mind_initialize()
new_syndicate_commando.mind.assigned_role = "MODE" new_syndicate_commando.mind.assigned_role = "MODE"
new_syndicate_commando.mind.special_role = "Syndicate Commando" new_syndicate_commando.mind.special_role = "Mercenary"
//Adds them to current traitor list. Which is really the extra antagonist list. //Adds them to current traitor list. Which is really the extra antagonist list.
ticker.mode.traitors += new_syndicate_commando.mind ticker.mode.traitors += new_syndicate_commando.mind

View File

@@ -34,5 +34,5 @@
/proc/Syndicate_announce(var/text , var/mob/Sender) /proc/Syndicate_announce(var/text , var/mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "\blue <b><font color=crimson>SYNDICATE:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]" msg = "\blue <b><font color=crimson>ILLEGAL:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
admins << msg admins << msg

View File

@@ -453,7 +453,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
new_character.loc = pick(wizardstart) new_character.loc = pick(wizardstart)
//ticker.mode.learn_basic_spells(new_character) //ticker.mode.learn_basic_spells(new_character)
ticker.mode.equip_wizard(new_character) ticker.mode.equip_wizard(new_character)
if("Syndicate") if("Mercenary")
var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn") var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn")
if(synd_spawn) if(synd_spawn)
new_character.loc = get_turf(synd_spawn) new_character.loc = get_turf(synd_spawn)

View File

@@ -4,7 +4,7 @@ var/const/syndicate_commandos_possible = 6 //if more Commandos are needed in the
var/global/sent_syndicate_strike_team = 0 var/global/sent_syndicate_strike_team = 0
/client/proc/syndicate_strike_team() /client/proc/syndicate_strike_team()
set category = "Fun" set category = "Fun"
set name = "Spawn Syndicate Strike Team" set name = "Spawn Mercenary Strike Team"
set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event." set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event."
if(!src.holder) if(!src.holder)
src << "Only administrators may use this command." src << "Only administrators may use this command."
@@ -16,15 +16,15 @@ var/global/sent_syndicate_strike_team = 0
// alert("Not so fast, buddy. Wait a few minutes until the game gets going. There are [(6000-world.time)/10] seconds remaining.") // alert("Not so fast, buddy. Wait a few minutes until the game gets going. There are [(6000-world.time)/10] seconds remaining.")
// return // return
if(sent_syndicate_strike_team == 1) if(sent_syndicate_strike_team == 1)
alert("The Syndicate are already sending a team, Mr. Dumbass.") alert("Criminal elements are already sending a team, Mr. Dumbass.")
return return
if(alert("Do you want to send in the Syndicate Strike Team? Once enabled, this is irreversible.",,"Yes","No")=="No") if(alert("Do you want to send in the Mercenary Strike Team? Once enabled, this is irreversible.",,"Yes","No")=="No")
return return
alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned syndicates have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.") alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned mercs have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.")
var/input = null var/input = null
while(!input) while(!input)
input = copytext(sanitize(input(src, "Please specify which mission the syndicate strike team shall undertake.", "Specify Mission", "")),1,MAX_MESSAGE_LEN) input = copytext(sanitize(input(src, "Please specify which mission the strike team shall undertake.", "Specify Mission", "")),1,MAX_MESSAGE_LEN)
if(!input) if(!input)
if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes") if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes")
return return
@@ -81,7 +81,7 @@ var/global/sent_syndicate_strike_team = 0
new_syndicate_commando.mind.store_memory("<B>Nuke Code:</B> \red [nuke_code].") new_syndicate_commando.mind.store_memory("<B>Nuke Code:</B> \red [nuke_code].")
new_syndicate_commando.mind.store_memory("<B>Mission:</B> \red [input].") new_syndicate_commando.mind.store_memory("<B>Mission:</B> \red [input].")
new_syndicate_commando << "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: \red<B>[input]</B>" new_syndicate_commando << "\blue You are an Elite Mercenary. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of criminal elements hostile to NanoTrasen. \nYour current mission is: \red<B>[input]</B>"
syndicate_commando_number-- syndicate_commando_number--
@@ -98,8 +98,8 @@ var/global/sent_syndicate_strike_team = 0
new /obj/effect/spawner/newbomb/timer/syndicate(L.loc) new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
del(L) del(L)
message_admins("\blue [key_name_admin(usr)] has spawned a Syndicate strike squad.", 1) message_admins("\blue [key_name_admin(usr)] has spawned a mercenary strike squad.", 1)
log_admin("[key_name(usr)] used Spawn Syndicate Squad.") log_admin("[key_name(usr)] used Spawn Mercenary Squad.")
feedback_add_details("admin_verb","SDTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","SDTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0) /client/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0)
@@ -121,7 +121,7 @@ var/global/sent_syndicate_strike_team = 0
//Creates mind stuff. //Creates mind stuff.
new_syndicate_commando.mind_initialize() new_syndicate_commando.mind_initialize()
new_syndicate_commando.mind.assigned_role = "MODE" new_syndicate_commando.mind.assigned_role = "MODE"
new_syndicate_commando.mind.special_role = "Syndicate Commando" new_syndicate_commando.mind.special_role = "Mercenary"
ticker.mode.traitors |= new_syndicate_commando.mind //Adds them to current traitor list. Which is really the extra antagonist list. ticker.mode.traitors |= new_syndicate_commando.mind //Adds them to current traitor list. Which is really the extra antagonist list.
new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected) new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected)
del(spawn_location) del(spawn_location)
@@ -171,7 +171,7 @@ var/global/sent_syndicate_strike_team = 0
W.icon_state = "id" W.icon_state = "id"
W.access = get_all_accesses()//They get full station access because obviously the syndicate has HAAAX, and can make special IDs for their most elite members. W.access = get_all_accesses()//They get full station access because obviously the syndicate has HAAAX, and can make special IDs for their most elite members.
W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)//Let's add their forged CentCom access and syndicate access. W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)//Let's add their forged CentCom access and syndicate access.
W.assignment = "Syndicate Commando" W.assignment = "Mercenary"
W.registered_name = real_name W.registered_name = real_name
equip_to_slot_or_del(W, slot_wear_id) equip_to_slot_or_del(W, slot_wear_id)

View File

@@ -75,7 +75,7 @@
name = "red space-helmet replica" name = "red space-helmet replica"
icon_state = "syndicate" icon_state = "syndicate"
item_state = "syndicate" item_state = "syndicate"
desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!"
flags = FPRINT | TABLEPASS | BLOCKHAIR flags = FPRINT | TABLEPASS | BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
siemens_coefficient = 2.0 siemens_coefficient = 2.0
@@ -262,4 +262,4 @@
item_state = "philosopher_wig" item_state = "philosopher_wig"
flags = FPRINT | TABLEPASS | BLOCKHAIR flags = FPRINT | TABLEPASS | BLOCKHAIR
siemens_coefficient = 2.0 siemens_coefficient = 2.0
body_parts_covered = 0 body_parts_covered = 0

View File

@@ -43,7 +43,7 @@
body_parts_covered = FACE|EYES body_parts_covered = FACE|EYES
/obj/item/clothing/mask/gas/syndicate /obj/item/clothing/mask/gas/syndicate
name = "syndicate mask" name = "tactical mask"
desc = "A close-fitting tactical mask that can be connected to an air supply." desc = "A close-fitting tactical mask that can be connected to an air supply."
icon_state = "swat" icon_state = "swat"
siemens_coefficient = 0.7 siemens_coefficient = 0.7

View File

@@ -1,7 +1,7 @@
//Regular syndicate space suit //Regular syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate /obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet" name = "red space helmet"
desc = "Top secret Spess Helmet." desc = "Top secret space helmet."
icon_state = "syndicate" icon_state = "syndicate"
item_state = "syndicate" item_state = "syndicate"
desc = "Has a tag: Totally not property of an enemy corporation, honest." desc = "Has a tag: Totally not property of an enemy corporation, honest."

View File

@@ -70,9 +70,9 @@
if(BIOHAZARD_OUTBREAK) if(BIOHAZARD_OUTBREAK)
newMsg.body = "[pick("A \'REDACTED\'","A biohazard","An outbreak","A virus")] on [affected_dest.name] has resulted in quarantine, stopping much shipping in the area. Although the quarantine is now lifted, authorities are calling for deliveries of medical supplies to treat the infected, and gas to replace contaminated stocks." newMsg.body = "[pick("A \'REDACTED\'","A biohazard","An outbreak","A virus")] on [affected_dest.name] has resulted in quarantine, stopping much shipping in the area. Although the quarantine is now lifted, authorities are calling for deliveries of medical supplies to treat the infected, and gas to replace contaminated stocks."
if(PIRATES) if(PIRATES)
newMsg.body = "[pick("Pirates","Criminal elements","A [pick("Syndicate","Donk Co.","Waffle Co.","\'REDACTED\'")] strike force")] have [pick("raided","blockaded","attempted to blackmail","attacked")] [affected_dest.name] today. Security has been tightened, but many valuable minerals were taken." newMsg.body = "[pick("Pirates","Criminal elements","A [pick("mercenary","Donk Co.","Waffle Co.","\'REDACTED\'")] strike force")] have [pick("raided","blockaded","attempted to blackmail","attacked")] [affected_dest.name] today. Security has been tightened, but many valuable minerals were taken."
if(CORPORATE_ATTACK) if(CORPORATE_ATTACK)
newMsg.body = "A small [pick("pirate","Cybersun Industries","Gorlex Marauders","Syndicate")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident." newMsg.body = "A small [pick("pirate","Cybersun Industries","Gorlex Marauders","mercenary")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident."
if(ALIEN_RAIDERS) if(ALIEN_RAIDERS)
if(prob(20)) if(prob(20))
newMsg.body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. NanoTrasen authorities are standing by to counter attempts at bio-terrorism." newMsg.body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. NanoTrasen authorities are standing by to counter attempts at bio-terrorism."

View File

@@ -66,7 +66,7 @@
newMsg.body += "[random_name(pick(MALE,FEMALE))] on [affected_dest.name] [pick("last week","yesterday","this morning","two days ago","three days ago")]\ newMsg.body += "[random_name(pick(MALE,FEMALE))] on [affected_dest.name] [pick("last week","yesterday","this morning","two days ago","three days ago")]\
[pick(". Assassination is suspected, but the perpetrators have not yet been brought to justice",\ [pick(". Assassination is suspected, but the perpetrators have not yet been brought to justice",\
" due to Syndicate infiltrators (since captured)",\ " due to mercenary infiltrators (since captured)",\
" during an industrial accident",\ " during an industrial accident",\
" due to [pick("heart failure","kidney failure","liver failure","brain hemorrhage")]")]" " due to [pick("heart failure","kidney failure","liver failure","brain hemorrhage")]")]"
@@ -94,7 +94,7 @@
if(prob(33)) if(prob(33))
newMsg.body += "were surprised when an unusual species experts have since identified as \ newMsg.body += "were surprised when an unusual species experts have since identified as \
[pick("a subclass of mammal","a divergent abhuman species","an intelligent species of lemur","organic/cyborg hybrids")] turned up. Believed to have been brought in by \ [pick("a subclass of mammal","a divergent abhuman species","an intelligent species of lemur","organic/cyborg hybrids")] turned up. Believed to have been brought in by \
[pick("alien smugglers","early colonists","syndicate raiders","unwitting tourists")], this is the first such specimen discovered in the wild." [pick("alien smugglers","early colonists","mercenary raiders","unwitting tourists")], this is the first such specimen discovered in the wild."
else if(prob(50)) else if(prob(50))
newMsg.body += "were attacked by a vicious [pick("nas'r","diyaab","samak","predator which has not yet been identified")]\ newMsg.body += "were attacked by a vicious [pick("nas'r","diyaab","samak","predator which has not yet been identified")]\
. Officials urge caution, and locals are advised to stock up on armaments." . Officials urge caution, and locals are advised to stock up on armaments."
@@ -175,7 +175,7 @@
"Mysterious Loud Rumbling Noises In [affected_dest.name] Found To Be Mysterious Loud Rumblings",\ "Mysterious Loud Rumbling Noises In [affected_dest.name] Found To Be Mysterious Loud Rumblings",\
"Alien ambassador becomes lost on [affected_dest.name], refuses to ask for directions",\ "Alien ambassador becomes lost on [affected_dest.name], refuses to ask for directions",\
"Swamp Gas Verified To Be Exhalations Of Stars--Movie Stars--Long Passed",\ "Swamp Gas Verified To Be Exhalations Of Stars--Movie Stars--Long Passed",\
"Tainted Broccoli Weapon Of Choice For Syndicate Assassins",\ "Tainted Broccoli Weapon Of Choice For Efficient Assassins",\
"Chefs Find Broccoli Effective Tool For Cutting Cheese",\ "Chefs Find Broccoli Effective Tool For Cutting Cheese",\
"Broccoli Found To Cause Grumpiness In Monkeys",\ "Broccoli Found To Cause Grumpiness In Monkeys",\
"Survey: 80% Of People on [affected_dest.name] Love Clog-Dancing",\ "Survey: 80% Of People on [affected_dest.name] Love Clog-Dancing",\

View File

@@ -107,7 +107,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
//AI laws //AI laws
for(var/mob/living/silicon/ai/M in living_mob_list) for(var/mob/living/silicon/ai/M in living_mob_list)
if(M.stat != 2 && M.see_in_dark != 0) if(M.stat != 2 && M.see_in_dark != 0)
var/who2 = pick("ALIENS", "BEARS", "CLOWNS", "XENOS", "PETES", "BOMBS", "FETISHES", "WIZARDS", "SYNDICATE AGENTS", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "BEES", "CARP", "CRABS", "EELS", "BANDITS", "LIGHTS") var/who2 = pick("ALIENS", "BEARS", "CLOWNS", "XENOS", "PETES", "BOMBS", "FETISHES", "WIZARDS", "MERCENARIES", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "BEES", "CARP", "CRABS", "EELS", "BANDITS", "LIGHTS")
var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "NETTLES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "BBQ GRILLS", "ID CARDS", "CAPTAINS") var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "NETTLES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "BBQ GRILLS", "ID CARDS", "CAPTAINS")
var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY", "CUBAN") var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY", "CUBAN")
var/who2pref = pick("MAD BECAUSE OF", "IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF") var/who2pref = pick("MAD BECAUSE OF", "IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF")
@@ -118,7 +118,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
//var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS") //var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS")
var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU") var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU")
var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED") var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED")
var/target = pick("a traitor", "a syndicate agent", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid") var/target = pick("a traitor", "a mercenary", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid")
var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE") var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors") var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
var/allergysev = pick("deathly", "mildly", "severely", "contagiously") var/allergysev = pick("deathly", "mildly", "severely", "contagiously")

View File

@@ -4,7 +4,7 @@ var/list/dreams = list(
"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness", "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
"a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights", "a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",
"a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect", "a blue light","an abandoned laboratory","Nanotrasen","mercenaries","blood","healing","power","respect",
"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
"the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer", "the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",
"the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician", "the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician",

View File

@@ -1797,7 +1797,7 @@
if(mind) if(mind)
switch(mind.special_role) switch(mind.special_role)
if("traitor","Syndicate") if("traitor","Mercenary")
holder.icon_state = "hudsyndicate" holder.icon_state = "hudsyndicate"
if("Revolutionary") if("Revolutionary")
holder.icon_state = "hudrevolutionary" holder.icon_state = "hudrevolutionary"

View File

@@ -14,7 +14,7 @@
if("cult") if("cult")
if(mind in ticker.mode:cult) if(mind in ticker.mode:cult)
ticker.mode.update_cult_icons_added(src.mind) ticker.mode.update_cult_icons_added(src.mind)
if("nuclear emergency") if("mercenary")
if(mind in ticker.mode:syndicates) if(mind in ticker.mode:syndicates)
ticker.mode.update_all_synd_icons() ticker.mode.update_all_synd_icons()
if("mutiny") if("mutiny")

View File

@@ -9,7 +9,7 @@ var/list/department_radio_keys = list(
":e" = "Engineering", "#e" = "Engineering", ".e" = "Engineering", ":e" = "Engineering", "#e" = "Engineering", ".e" = "Engineering",
":s" = "Security", "#s" = "Security", ".s" = "Security", ":s" = "Security", "#s" = "Security", ".s" = "Security",
":w" = "whisper", "#w" = "whisper", ".w" = "whisper", ":w" = "whisper", "#w" = "whisper", ".w" = "whisper",
":t" = "Syndicate", "#t" = "Syndicate", ".t" = "Syndicate", ":t" = "Mercenary", "#t" = "Mercenary", ".t" = "Mercenary",
":u" = "Supply", "#u" = "Supply", ".u" = "Supply", ":u" = "Supply", "#u" = "Supply", ".u" = "Supply",
":R" = "right ear", "#R" = "right ear", ".R" = "right ear", ":R" = "right ear", "#R" = "right ear", ".R" = "right ear",
@@ -22,7 +22,7 @@ var/list/department_radio_keys = list(
":E" = "Engineering", "#E" = "Engineering", ".E" = "Engineering", ":E" = "Engineering", "#E" = "Engineering", ".E" = "Engineering",
":S" = "Security", "#S" = "Security", ".S" = "Security", ":S" = "Security", "#S" = "Security", ".S" = "Security",
":W" = "whisper", "#W" = "whisper", ".W" = "whisper", ":W" = "whisper", "#W" = "whisper", ".W" = "whisper",
":T" = "Syndicate", "#T" = "Syndicate", ".T" = "Syndicate", ":T" = "Mercenary", "#T" = "Mercenary", ".T" = "Mercenary",
":U" = "Supply", "#U" = "Supply", ".U" = "Supply", ":U" = "Supply", "#U" = "Supply", ".U" = "Supply",
//kinda localization -- rastaf0 //kinda localization -- rastaf0
@@ -37,7 +37,7 @@ var/list/department_radio_keys = list(
":<3A>" = "Engineering", "#<23>" = "Engineering", ".<2E>" = "Engineering", ":<3A>" = "Engineering", "#<23>" = "Engineering", ".<2E>" = "Engineering",
":<3A>" = "Security", "#<23>" = "Security", ".<2E>" = "Security", ":<3A>" = "Security", "#<23>" = "Security", ".<2E>" = "Security",
":<3A>" = "whisper", "#<23>" = "whisper", ".<2E>" = "whisper", ":<3A>" = "whisper", "#<23>" = "whisper", ".<2E>" = "whisper",
":<3A>" = "Syndicate", "#<23>" = "Syndicate", ".<2E>" = "Syndicate", ":<3A>" = "Mercenary", "#<23>" = "Mercenary", ".<2E>" = "Mercenary",
":<3A>" = "Supply", "#<23>" = "Supply", ".<2E>" = "Supply", ":<3A>" = "Supply", "#<23>" = "Supply", ".<2E>" = "Supply",
) )

View File

@@ -135,7 +135,7 @@
clear_supplied_laws() clear_supplied_laws()
clear_inherent_laws() clear_inherent_laws()
laws = new /datum/ai_laws/syndicate_override laws = new /datum/ai_laws/syndicate_override
set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.") set_zeroth_law("Only [user.real_name] and people he designates as being such are operatives.")
src << "<b>Obey these laws:</b>" src << "<b>Obey these laws:</b>"
laws.show_laws(src) laws.show_laws(src)

View File

@@ -811,7 +811,7 @@ var/list/robot_verbs_default = list(
laws = new /datum/ai_laws/syndicate_override laws = new /datum/ai_laws/syndicate_override
var/time = time2text(world.realtime,"hh:mm:ss") var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])") lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])")
set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.") set_zeroth_law("Only [user.real_name] and people he designates as being such are operatives.")
src << "\red ALERT: Foreign software detected." src << "\red ALERT: Foreign software detected."
sleep(5) sleep(5)
src << "\red Initiating diagnostics..." src << "\red Initiating diagnostics..."

View File

@@ -369,7 +369,7 @@
return return
/obj/item/weapon/robot_module/syndicate /obj/item/weapon/robot_module/syndicate
name = "syndicate robot module" name = "illegal robot module"
New() New()
src.modules += new /obj/item/device/flashlight(src) src.modules += new /obj/item/device/flashlight(src)

View File

@@ -61,7 +61,7 @@
/obj/item/weapon/gun/energy/crossbow /obj/item/weapon/gun/energy/crossbow
name = "mini energy-crossbow" name = "mini energy-crossbow"
desc = "A weapon favored by many of the syndicates stealth specialists." desc = "A weapon favored by many mercenary stealth specialists."
icon_state = "crossbow" icon_state = "crossbow"
w_class = 2.0 w_class = 2.0
item_state = "crossbow" item_state = "crossbow"
@@ -100,7 +100,7 @@
/obj/item/weapon/gun/energy/crossbow/largecrossbow /obj/item/weapon/gun/energy/crossbow/largecrossbow
name = "Energy Crossbow" name = "Energy Crossbow"
desc = "A weapon favored by syndicate infiltration teams." desc = "A weapon favored by mercenary infiltration teams."
w_class = 4.0 w_class = 4.0
force = 10 force = 10
matter = list("metal" = 200000) matter = list("metal" = 200000)