From 99ff852e46c4ac0f5303e454290d3cf19b76384d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 19 Oct 2014 15:54:24 +1030 Subject: [PATCH] Removes references to the Syndicate and renames nuclear emergency mode. --- .../computer3/computers/communications.dm | 2 +- code/controllers/communications.dm | 2 +- code/controllers/shuttle_controller.dm | 32 +++++++++---------- code/datums/ai_laws.dm | 6 ++-- code/datums/mind.dm | 20 ++++++------ code/game/area/Space Station 13 areas.dm | 14 ++++---- .../game/gamemodes/autotraitor/autotraitor.dm | 2 +- code/game/gamemodes/calamity/calamity.dm | 5 +-- code/game/gamemodes/changeling/changeling.dm | 3 -- .../game/gamemodes/changeling/traitor_chan.dm | 2 +- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/game/gamemodes/events/space_ninja.dm | 6 ++-- code/game/gamemodes/extended/extended.dm | 3 -- code/game/gamemodes/game_mode.dm | 12 +++---- code/game/gamemodes/gameticker.dm | 4 +-- code/game/gamemodes/mutiny/mutiny.dm | 2 +- code/game/gamemodes/newobjective.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 23 +++++++------ code/game/gamemodes/nuclear/nuclearbomb.dm | 4 +-- code/game/gamemodes/revolution/revolution.dm | 2 +- .../gamemodes/revolution/rp-revolution.dm | 8 ++--- code/game/gamemodes/sandbox/sandbox.dm | 3 -- code/game/gamemodes/traitor/traitor.dm | 4 +-- code/game/machinery/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/pod.dm | 2 +- .../effects/decals/posters/tgposters.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 2 +- code/game/objects/items/devices/uplinks.dm | 2 +- code/game/objects/items/toys.dm | 2 +- code/game/turfs/space/space.dm | 2 +- code/modules/admin/player_panel.dm | 4 +-- code/modules/admin/topic.dm | 8 ++--- code/modules/admin/verbs/cinematic.dm | 4 +-- code/modules/admin/verbs/one_click_antag.dm | 8 ++--- code/modules/admin/verbs/pray.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- .../admin/verbs/striketeam_syndicate.dm | 20 ++++++------ code/modules/clothing/head/misc.dm | 4 +-- code/modules/clothing/masks/gasmask.dm | 2 +- code/modules/clothing/spacesuits/syndi.dm | 2 +- code/modules/economy/Events.dm | 4 +-- code/modules/economy/Events_Mundane.dm | 6 ++-- code/modules/events/ion_storm.dm | 4 +-- code/modules/flufftext/Dreaming.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/login.dm | 2 +- code/modules/mob/living/say.dm | 6 ++-- .../mob/living/silicon/robot/drone/drone.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 2 +- code/modules/projectiles/guns/energy/stun.dm | 4 +-- 52 files changed, 127 insertions(+), 144 deletions(-) diff --git a/code/WorkInProgress/computer3/computers/communications.dm b/code/WorkInProgress/computer3/computers/communications.dm index 3c623f8108..f39c4c17fd 100644 --- a/code/WorkInProgress/computer3/computers/communications.dm +++ b/code/WorkInProgress/computer3/computers/communications.dm @@ -214,7 +214,7 @@ return Syndicate_announce(input, usr) 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 spawn(600)//10 minute cooldown centcomm_message_cooldown = 0 diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index e7683de03b..7981527bea 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -119,7 +119,7 @@ var/list/radiochannels = list( "Security" = SEC_FREQ, "Response Team" = ERT_FREQ, "Special Ops" = DTH_FREQ, - "Syndicate" = SYND_FREQ, + "Mercenary" = SYND_FREQ, "Supply" = SUP_FREQ ) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 93ba5cc4c7..81403ec3b8 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -18,7 +18,7 @@ var/global/datum/shuttle_controller/shuttle_controller process_shuttles = list() var/datum/shuttle/ferry/shuttle - + // Escape shuttle and pods shuttle = new/datum/shuttle/ferry/emergency() shuttle.location = 1 @@ -35,7 +35,7 @@ var/global/datum/shuttle_controller/shuttle_controller //shuttle.dock_target_station = "cargo_bay" shuttles["Escape"] = shuttle process_shuttles += shuttle - + shuttle = new/datum/shuttle/ferry/escape_pod() shuttle.location = 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 process_shuttles += shuttle shuttles["Escape Pod 2"] = shuttle - + shuttle = new/datum/shuttle/ferry/escape_pod() shuttle.location = 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 process_shuttles += shuttle shuttles["Escape Pod 3"] = shuttle - + //There is no pod 4, apparently. - + shuttle = new/datum/shuttle/ferry/escape_pod() shuttle.location = 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 process_shuttles += shuttle shuttles["Escape Pod 5"] = shuttle - + //give the emergency shuttle controller it's shuttles emergency_shuttle.shuttle = shuttles["Escape"] emergency_shuttle.escape_pods = list( @@ -102,7 +102,7 @@ var/global/datum/shuttle_controller/shuttle_controller shuttles["Escape Pod 3"], shuttles["Escape Pod 5"], ) - + // Supply shuttle shuttle = new/datum/shuttle/ferry/supply() shuttle.location = 1 @@ -113,7 +113,7 @@ var/global/datum/shuttle_controller/shuttle_controller shuttle.dock_target_station = "cargo_bay" shuttles["Supply"] = shuttle process_shuttles += shuttle - + supply_controller.shuttle = shuttle // Admin shuttles. @@ -232,7 +232,7 @@ var/global/datum/shuttle_controller/shuttle_controller MS.interim = locate(/area/syndicate_station/transit) 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 @@ -240,7 +240,7 @@ var/global/datum/shuttle_controller/shuttle_controller var/datum/shuttle/shuttle var/datum/shuttle/ferry/multidock/multidock var/list/dock_controller_map = list() //so we only have to iterate once through each list - + //multidock shuttles var/list/dock_controller_map_station = list() var/list/dock_controller_map_offsite = list() @@ -253,7 +253,7 @@ var/global/datum/shuttle_controller/shuttle_controller multidock = shuttle dock_controller_map_station[multidock.docking_controller_tag_station] = multidock dock_controller_map_offsite[multidock.docking_controller_tag_offsite] = multidock - + //escape pod arming controllers var/datum/shuttle/ferry/escape_pod/pod 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.docking_controller = C.program dock_controller_map -= C.id_tag - + //escape pods 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 EPC.pod = shuttle - + if (C.id_tag in dock_controller_map_station) multidock = dock_controller_map_station[C.id_tag] if (istype(multidock)) @@ -285,20 +285,20 @@ var/global/datum/shuttle_controller/shuttle_controller if (istype(multidock)) multidock.docking_controller_offsite = C.program dock_controller_map_offsite -= C.id_tag - + //escape pods if (C.id_tag in pod_controller_map) pod = pod_controller_map[C.id_tag] if (istype(C.program, /datum/computer/file/embedded_program/docking/simple/escape_pod/)) pod.arming_controller = C.program - + //sanity check if (dock_controller_map.len || dock_controller_map_station.len || dock_controller_map_offsite.len) var/dat = "" for (var/dock_tag in dock_controller_map + dock_controller_map_station + dock_controller_map_offsite) dat += "\"[dock_tag]\", " 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 for (var/shuttle_tag in shuttles) shuttle = shuttles[shuttle_tag] diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index d411920139..8c0db1ebd3 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -61,10 +61,10 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen /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 must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.") + 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 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 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() ..() diff --git a/code/datums/mind.dm b/code/datums/mind.dm index cc22ce05d3..287a4d9be0 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -761,8 +761,8 @@ datum/mind special_role = null for (var/datum/objective/nuclear/O in objectives) objectives-=O - current << "\red You have been brainwashed! You are no longer a syndicate operative!" - log_admin("[key_name_admin(usr)] has de-nuke op'ed [current].") + current << "\red You have been brainwashed! You are no longer an operative!" + log_admin("[key_name_admin(usr)] has de-merc'd [current].") if("nuclear") if(!(src in ticker.mode.syndicates)) ticker.mode.syndicates += src @@ -771,11 +771,11 @@ datum/mind ticker.mode.prepare_syndicate_leader(src) else 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!" ticker.mode.forge_syndicate_objectives(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") current.loc = get_turf(locate("landmark*Syndicate-Spawn")) if("dressup") @@ -791,7 +791,7 @@ datum/mind del(H.w_uniform) if (!ticker.mode.equip_syndicate(current)) - usr << "\red Equipping a syndicate failed!" + usr << "\red Equipping an operative failed!" if("tellcode") var/code for (var/obj/machinery/nuclearbomb/bombue in machines) @@ -799,7 +799,7 @@ datum/mind code = bombue.r_code break if (code) - store_memory("Syndicate Nuclear Bomb Code: [code]", 0, 0) + store_memory("Nuclear Bomb Code: [code]", 0, 0) current << "The nuclear authorization code is: [code]" else usr << "\red No valid nuke found!" @@ -968,13 +968,13 @@ datum/mind var/crystals if (suplink) 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 (suplink) suplink.uses = crystals if("uplink") 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"]) var/obj_count = 1 @@ -1059,9 +1059,9 @@ datum/mind ticker.mode.prepare_syndicate_leader(src) else current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" - special_role = "Syndicate" + special_role = "Mercenary" 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.greet_syndicate(src) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 0ba41f8b0f..4420c63d38 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -264,11 +264,11 @@ var/list/ghostteleportlocs = list() icon_state = "shuttlered2" /area/shuttle/syndicate_elite/mothership - name = "\improper Syndicate Elite Shuttle" + name = "\improper Merc Elite Shuttle" icon_state = "shuttlered" /area/shuttle/syndicate_elite/station - name = "\improper Syndicate Elite Shuttle" + name = "\improper Merc Elite Shuttle" icon_state = "shuttlered2" /area/shuttle/administration/centcom @@ -381,17 +381,17 @@ var/list/ghostteleportlocs = list() //SYNDICATES /area/syndicate_mothership - name = "\improper Syndicate Base" + name = "\improper Mercenary Base" icon_state = "syndie-ship" requires_power = 0 unlimited_power = 1 /area/syndicate_mothership/control - name = "\improper Syndicate Control Room" + name = "\improper Mercenary Control Room" icon_state = "syndie-control" /area/syndicate_mothership/elite_squad - name = "\improper Syndicate Elite Squad" + name = "\improper Elite Mercenary Squad" icon_state = "syndie-elite" //EXTRA @@ -454,13 +454,13 @@ var/list/ghostteleportlocs = list() //names are used /area/syndicate_station - name = "\improper Syndicate Station" + name = "\improper Independant Station" icon_state = "yellow" requires_power = 0 unlimited_power = 1 /area/syndicate_station/start - name = "\improper Syndicate Forward Operating Base" + name = "\improper Mercenary Forward Operating Base" icon_state = "yellow" /area/syndicate_station/southwest diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index 898378543d..534d6d109c 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -132,7 +132,7 @@ equip_traitor(newtraitor) traitors += newtraitor.mind - newtraitor << "\red ATTENTION: \black It is time to pay your debt to the Syndicate..." + newtraitor << "\red No time like the present. \black It's time to take matters into your own hands..." newtraitor << "You are now a traitor." newtraitor.mind.special_role = "traitor" newtraitor.hud_updateflag |= 1 << SPECIALROLE_HUD diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm index 4645fd2d3b..8852493a68 100644 --- a/code/game/gamemodes/calamity/calamity.dm +++ b/code/game/gamemodes/calamity/calamity.dm @@ -13,9 +13,6 @@ required_players = 1 votable = 0 //Remove after testing. - uplink_welcome = "Syndicate Uplink Console:" - uplink_uses = 10 - //Possible roundstart antag types. var/list/atypes = list("syndi","ling","tater","wiz","ninja","vox","cult") //Readd slug when borer spawn is fixed. var/list/chosen_atypes = list() @@ -176,7 +173,7 @@ switch(role) if("syndi") - role_text = "Syndicate Operative" + role_text = "Mercenary" if("ling") role_text = "Changeling" if("tater") diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 0dbfa689e1..1f7b8a6510 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -14,9 +14,6 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" required_enemies = 1 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_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 diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 2dbec4fa60..501e14bd20 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -10,7 +10,7 @@ /datum/game_mode/traitor/changeling/announce() world << "The current game mode is - Traitor+Changeling!" - world << "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!" + world << "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!" /datum/game_mode/traitor/changeling/pre_setup() diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index ded12b2da8..e2dba90378 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1212,7 +1212,7 @@ ________________________________________________________________________________ U.client.images += image(tempHud,target,"hudwizard") if("Hunter","Sentinel","Drone","Queen") U.client.images += image(tempHud,target,"hudalien") - if("Syndicate") + if("Mercenary") U.client.images += image(tempHud,target,"hudoperative") if("Death Commando") U.client.images += image(tempHud,target,"huddeathsquad") diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index ff8b760bc1..3f1e94654a 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -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. */ /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)) if(1) 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) 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) - 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) directive += "Let no one question the mercy of the Spider Clan. Ensure the safety of all non-essential personnel you encounter." if(9) @@ -411,7 +411,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. if(11) directive += "Our honor is on the line. Utilize only honorable tactics when dealing with opponents." 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) directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff." if(14) diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index 2c37c1bb84..3e04928507 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -3,9 +3,6 @@ config_tag = "extended" 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_h = 1800 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 1514e35478..6959bdf976 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -29,7 +29,7 @@ var/recommended_enemies = 0 var/newscaster_announcements = null var/ert_disabled = 0 - var/uplink_welcome = "Syndicate Uplink Console:" + var/uplink_welcome = "Illegal Uplink Console:" var/uplink_uses = 10 var/list/datum/uplink_item/uplink_items = 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/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/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") ), "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/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") ), "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/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/clothing/mask/gas/voice, 4, "Voice Changer", "VC"), new/datum/uplink_item(/obj/item/device/chameleon, 4, "Chameleon-Projector", "CP") @@ -213,14 +213,14 @@ /datum/game_mode/proc/send_intercept() var/intercepttext = "Cent. Com. Update Requested status information:
" - intercepttext += " In case you have misplaced your copy, attached is a list of personnel whom reliable sources™ suspect may be affiliated with the Syndicate:
" + intercepttext += " In case you have misplaced your copy, attached is a list of personnel whom reliable sources™ suspect may be affiliated with criminal organisations or hostile foreign entities:
" var/list/suspects = list() for(var/mob/living/carbon/human/man in player_list) if(man.client && man.mind) // NT relation option 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. if(man.client.prefs.nanotrasen_relation == "Opposed" && prob(50) || \ man.client.prefs.nanotrasen_relation == "Skeptical" && prob(20)) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 484cf4052c..51bed77adb 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -214,7 +214,7 @@ var/global/datum/controller/gameticker/ticker if( mode && !override ) override = mode.name 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) sleep(35) world << sound('sound/effects/explosionfar.ogg') @@ -236,7 +236,7 @@ var/global/datum/controller/gameticker/ticker if( mode && !override ) override = mode.name switch( override ) - if("nuclear emergency") //Nuke Ops successfully bombed the station + if("mercenary") //Nuke Ops successfully bombed the station flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index 43b68f91dc..4e4170d02c 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -51,7 +51,7 @@ datum/game_mode/mutiny "leaks into a negative reality", "antiparticle clouds", "residual bluespace energy", - "suspected syndicate operatives", + "suspected criminal operatives", "malfunctioning von Neumann probe swarms", "shadowy interlopers", "a stranded Vox arkship", diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index c2608cfa3d..8cf15cfd59 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -310,7 +310,7 @@ datum target = targeta job = joba 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() if(!emergency_shuttle.returned()) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 9a7f2e4cdf..8172cf16be 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -1,5 +1,5 @@ /* - NUCLEAR EMERGENCY ROUNDTYPE + MERCENARY ROUNDTYPE */ var/global/list/turf/synd_spawn = list() @@ -10,7 +10,7 @@ var/global/list/turf/synd_spawn = list() /datum/game_mode/nuclear - name = "nuclear emergency" + name = "mercenary" config_tag = "nuclear" required_players = 15 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() - world << "The current game mode is - Nuclear Emergency!" + world << "The current game mode is - Mercenary!" world << "A [syndicate_name()] Strike Force is approaching [station_name()]!" - 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!\nSyndicate: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\nPersonnel: Hold the disk and escape with the disk on the shuttle!" /datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later if(!..()) @@ -69,7 +68,7 @@ var/global/list/turf/synd_spawn = list() for(var/datum/mind/synd_mind in syndicates) 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 @@ -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) var/obj/effect/landmark/code_spawn = locate("landmark*Nuclear-Code") if (nuke_code) - synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) + synd_mind.store_memory("Nuclear Bomb Code: [nuke_code]", 0, 0) synd_mind.current << "The nuclear authorization code is: [nuke_code]" synd_mind.current << "To speak on the strike team's private channel use :t" 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) if (you_are) - syndicate.current << "\blue You are a [syndicate_name()] agent!" + syndicate.current << "\blue You are a [syndicate_name()] operative!" show_objectives(syndicate) /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 //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") - world << "Syndicate Major Victory!" + world << "Mercenary Major Victory!" world << "[syndicate_name()] operatives have destroyed [station_name()]!" 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()) feedback_set_details("round_end_result","loss - evacuation - disk not secured") - world << "Syndicate Minor Victory!" + world << "Mercenary Minor Victory!" world << "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!" else if (!disk_rescued && crew_evacuated) feedback_set_details("round_end_result","halfwin - detonation averted") - world << "Syndicate Minor Victory!" + world << "Mercenary Minor Victory!" world << "[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted. Next time, don't lose the disk!" 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() if( syndicates.len || (ticker && istype(ticker.mode,/datum/game_mode/nuclear)) ) - var/text = "The syndicate operatives were:" + var/text = "The mercenaries were:" for(var/datum/mind/syndicate in syndicates) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index f060697b36..ce9082699f 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -403,7 +403,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) off_station = 2 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) 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 @@ -411,7 +411,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) ticker.station_explosion_cinematic(off_station,null) if(ticker.mode) ticker.mode.explosion_in_progress = 0 - if(ticker.mode.name == "nuclear emergency") + if(ticker.mode.name == "mercenary") ticker.mode:nukes_left -- else world << "The station was destoyed by the nuclear blast!" diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 8737b296d3..d4159e55db 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -150,7 +150,7 @@ ) var/where = mob.equip_in_one_of_slots(T, slots) 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 mob << "The flash in your [where] will help you to persuade the crew to join your cause." mob.update_icons() diff --git a/code/game/gamemodes/revolution/rp-revolution.dm b/code/game/gamemodes/revolution/rp-revolution.dm index 282864a3fe..815b3be3cb 100644 --- a/code/game/gamemodes/revolution/rp-revolution.dm +++ b/code/game/gamemodes/revolution/rp-revolution.dm @@ -19,16 +19,12 @@ var/all_brigged = 0 var/brigged_time = 0 - uplink_welcome = "Syndicate Uplink Console:" - uplink_uses = 10 - - /datum/game_mode/rp_revolution/announce() world << "The current game mode is - Revolution RP!" /datum/game_mode/rp_revolution/send_intercept() var/intercepttext = "Cent. Com. Update Requested staus information:
" - intercepttext += " Cent. Com has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:" + intercepttext += " Cent. Com has recently been contacted by the following subervsive or criminal-affiliated organisations in your area, please investigate any information you may have:" var/list/possible_modes = list() possible_modes.Add("revolution", "wizard", "traitor", "malf") @@ -95,7 +91,7 @@ /datum/game_mode/rp_revolution/send_intercept() var/intercepttext = "Cent. Com. Update Requested staus information:
" - intercepttext += " Cent. Com has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:" + intercepttext += " Cent. Com has recently been contacted by the following subversive or criminal-affiliated organisations in your area, please investigate any information you may have:" var/list/possible_modes = list() possible_modes.Add("revolution", "wizard", "nuke", "traitor", "malf") diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index e3c270678d..1f4bc59929 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -3,9 +3,6 @@ config_tag = "sandbox" required_players = 0 - uplink_welcome = "Syndicate Uplink Console:" - uplink_uses = 10 - /datum/game_mode/sandbox/announce() world << "The current game mode is - Sandbox!" world << "Build your own station with the sandbox-panel command!" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 1f6fbf4496..f96b850fb9 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -24,7 +24,7 @@ /datum/game_mode/traitor/announce() world << "The current game mode is - Traitor!" - world << "There is a syndicate traitor on the station. Do not let the traitor succeed!" + world << "There is a foreign agent or traitor on the station. Do not let the traitor succeed!" /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. /datum/game_mode/proc/give_codewords(mob/living/traitor_mob) - traitor_mob << "The Syndicate provided you with the following information on how to identify their agents:" + traitor_mob << "Your employers provided you with the following information on how to identify possible allies:" traitor_mob << "Code Phrase: [syndicate_code_phrase]" traitor_mob << "Code Response: [syndicate_code_response]" traitor_mob.mind.store_memory("Code Phrase: [syndicate_code_phrase]") diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 88646814b2..8084ab09ff 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -190,7 +190,7 @@ if("revolution") 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 - if("nuclear emergency") + if("mercenary") if(H.mind in ticker.mode.syndicates) ticker.mode.update_all_synd_icons() if("cult") diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 043f44d096..a6047cf534 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -209,7 +209,7 @@ return Syndicate_announce(input, usr) 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 spawn(300)//10 minute cooldown centcomm_message_cooldown = 0 diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index eeadf4de4c..5a33b62cb8 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -206,7 +206,7 @@ /obj/machinery/computer/pod/old/syndicate 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" req_access = list(access_syndicate) diff --git a/code/game/objects/effects/decals/posters/tgposters.dm b/code/game/objects/effects/decals/posters/tgposters.dm index 3dff589c3a..5fb94396d5 100644 --- a/code/game/objects/effects/decals/posters/tgposters.dm +++ b/code/game/objects/effects/decals/posters/tgposters.dm @@ -20,7 +20,7 @@ icon_state="poster4" /datum/poster/tg_5 - name = "Syndicate Recruitment Poster" + name = "Mercenary Recruitment Poster" desc = "See the galaxy! Shatter corrupt megacorporations! Join today!" icon_state="poster5" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 287e827249..24a8275d41 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -17,7 +17,7 @@ /obj/item/device/encryptionkey/syndicate icon_state = "cypherkey" - channels = list("Syndicate" = 1) + channels = list("Mercenary" = 1) origin_tech = "syndicate=3" syndie = 1//Signifies that it de-crypts Syndicate transmissions diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 0d74cb57c7..b61248f9d4 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -160,7 +160,7 @@ datum/nano_item_lists 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) - var/title = "Syndicate Uplink" + var/title = "Remote Uplink" var/data[0] data["welcome"] = welcome diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 28fa0f46db..4fa42ad71c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -88,7 +88,7 @@ item_state = "balloon-empty" /obj/item/toy/syndicateballoon - name = "syndicate balloon" + name = "criminal balloon" desc = "There is a tag on the back that reads \"FUK NT!11!\"." throwforce = 0 throw_speed = 4 diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 10b12973c7..7b1a17abac 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -75,7 +75,7 @@ // 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.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)) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index a5ccbb9100..5de314db4c 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -411,14 +411,14 @@ dat += "[ticker.delay_end ? "End Round Normally" : "Delay Round End"]
" if(ticker.mode.syndicates.len) - dat += "
" + dat += "
Syndicates
" for(var/datum/mind/N in ticker.mode.syndicates) var/mob/M = N.current if(M) dat += "" dat += "" else - dat += "" + dat += "" dat += "
Mercenaries
[M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""]PM
Nuclear Operative not found!
Mercenary not found!

" for(var/obj/item/weapon/disk/nuclear/N in world) dat += "" + jobs += "" else - jobs += "" + jobs += "" //Revolutionary if(jobban_isbanned(M, "revolutionary") || isbanned_dept) @@ -1476,11 +1476,11 @@ usr << "The person you are trying to contact is not wearing a headset" 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 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. \"[input]\" Message ends.\"" else if(href_list["CentcommFaxView"]) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 863efb6bc9..e21de8641d 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -11,8 +11,8 @@ var/override switch(parameter) 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) - 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) return \ No newline at end of file diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 18fcee188b..e2c308bcb4 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -264,7 +264,7 @@ client/proc/one_click_antag() if(nuke_spawn) 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: [nuke_code]" + 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: [nuke_code]" P.name = "nuclear bomb code and instructions" 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. for(var/mob/dead/observer/G in player_list) 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((world.time-time_passed)>300)//If more than 30 game seconds passed. return @@ -369,7 +369,7 @@ client/proc/one_click_antag() //So they don't forget their code or mission. - new_syndicate_commando << "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red [input]" + new_syndicate_commando << "\blue You are an Elite Mercenary. [!syndicate_leader_selected?"commando":"LEADER"] in the service of criminal elements hostile to NanoTrasen. \nYour current mission is: \red [input]" numagents-- if(numagents >= 6) @@ -424,7 +424,7 @@ client/proc/one_click_antag() //Creates mind stuff. new_syndicate_commando.mind_initialize() 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. ticker.mode.traitors += new_syndicate_commando.mind diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index fd91142cdf..e302809712 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -34,5 +34,5 @@ /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "\blue SYNDICATE:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg = "\blue ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" admins << msg diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e883f5fd43..9461b9477c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -453,7 +453,7 @@ Traitors and the like can also be revived with the previous role mostly intact. new_character.loc = pick(wizardstart) //ticker.mode.learn_basic_spells(new_character) ticker.mode.equip_wizard(new_character) - if("Syndicate") + if("Mercenary") var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn") if(synd_spawn) new_character.loc = get_turf(synd_spawn) diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index bd1b1707f6..39059ba4f6 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -4,7 +4,7 @@ var/const/syndicate_commandos_possible = 6 //if more Commandos are needed in the var/global/sent_syndicate_strike_team = 0 /client/proc/syndicate_strike_team() 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." if(!src.holder) 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.") // return 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 - 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 - 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 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(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes") return @@ -81,7 +81,7 @@ var/global/sent_syndicate_strike_team = 0 new_syndicate_commando.mind.store_memory("Nuke Code: \red [nuke_code].") new_syndicate_commando.mind.store_memory("Mission: \red [input].") - new_syndicate_commando << "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red[input]" + new_syndicate_commando << "\blue You are an Elite Mercenary. [!syndicate_leader_selected?"commando":"LEADER"] in the service of criminal elements hostile to NanoTrasen. \nYour current mission is: \red[input]" syndicate_commando_number-- @@ -98,8 +98,8 @@ var/global/sent_syndicate_strike_team = 0 new /obj/effect/spawner/newbomb/timer/syndicate(L.loc) del(L) - message_admins("\blue [key_name_admin(usr)] has spawned a Syndicate strike squad.", 1) - log_admin("[key_name(usr)] used Spawn Syndicate Squad.") + message_admins("\blue [key_name_admin(usr)] has spawned a mercenary strike squad.", 1) + 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! /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. new_syndicate_commando.mind_initialize() 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. new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected) del(spawn_location) @@ -171,7 +171,7 @@ var/global/sent_syndicate_strike_team = 0 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 += 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 equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index a1fbcfa0d3..4316d427c2 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -75,7 +75,7 @@ name = "red space-helmet replica" icon_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_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE siemens_coefficient = 2.0 @@ -262,4 +262,4 @@ item_state = "philosopher_wig" flags = FPRINT | TABLEPASS | BLOCKHAIR siemens_coefficient = 2.0 - body_parts_covered = 0 \ No newline at end of file + body_parts_covered = 0 diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 4014b59dec..b48cbdaa0a 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -43,7 +43,7 @@ body_parts_covered = FACE|EYES /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." icon_state = "swat" siemens_coefficient = 0.7 diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index e198f87012..698180d689 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -1,7 +1,7 @@ //Regular syndicate space suit /obj/item/clothing/head/helmet/space/syndicate name = "red space helmet" - desc = "Top secret Spess Helmet." + desc = "Top secret space helmet." icon_state = "syndicate" item_state = "syndicate" desc = "Has a tag: Totally not property of an enemy corporation, honest." diff --git a/code/modules/economy/Events.dm b/code/modules/economy/Events.dm index dd39726e19..070ba5449a 100644 --- a/code/modules/economy/Events.dm +++ b/code/modules/economy/Events.dm @@ -70,9 +70,9 @@ 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." 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) - 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(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." diff --git a/code/modules/economy/Events_Mundane.dm b/code/modules/economy/Events_Mundane.dm index b2f9daba3c..0a381a7ce7 100644 --- a/code/modules/economy/Events_Mundane.dm +++ b/code/modules/economy/Events_Mundane.dm @@ -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")]\ [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",\ " due to [pick("heart failure","kidney failure","liver failure","brain hemorrhage")]")]" @@ -94,7 +94,7 @@ if(prob(33)) 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("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)) 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." @@ -175,7 +175,7 @@ "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",\ "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",\ "Broccoli Found To Cause Grumpiness In Monkeys",\ "Survey: 80% Of People on [affected_dest.name] Love Clog-Dancing",\ diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index f5adaf4808..78e1c76b18 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -107,7 +107,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is //AI laws for(var/mob/living/silicon/ai/M in living_mob_list) 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/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") @@ -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/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/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/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors") var/allergysev = pick("deathly", "mildly", "severely", "contagiously") diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 5e204987af..f6bd863aa0 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -4,7 +4,7 @@ var/list/dreams = list( "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", "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", "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", diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index b9f91f80ce..692cfae83f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1797,7 +1797,7 @@ if(mind) switch(mind.special_role) - if("traitor","Syndicate") + if("traitor","Mercenary") holder.icon_state = "hudsyndicate" if("Revolutionary") holder.icon_state = "hudrevolutionary" diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index bdd834a80d..b43da76953 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -14,7 +14,7 @@ if("cult") if(mind in ticker.mode:cult) ticker.mode.update_cult_icons_added(src.mind) - if("nuclear emergency") + if("mercenary") if(mind in ticker.mode:syndicates) ticker.mode.update_all_synd_icons() if("mutiny") diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f778e46209..8e4dec88ff 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -9,7 +9,7 @@ var/list/department_radio_keys = list( ":e" = "Engineering", "#e" = "Engineering", ".e" = "Engineering", ":s" = "Security", "#s" = "Security", ".s" = "Security", ":w" = "whisper", "#w" = "whisper", ".w" = "whisper", - ":t" = "Syndicate", "#t" = "Syndicate", ".t" = "Syndicate", + ":t" = "Mercenary", "#t" = "Mercenary", ".t" = "Mercenary", ":u" = "Supply", "#u" = "Supply", ".u" = "Supply", ":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", ":S" = "Security", "#S" = "Security", ".S" = "Security", ":W" = "whisper", "#W" = "whisper", ".W" = "whisper", - ":T" = "Syndicate", "#T" = "Syndicate", ".T" = "Syndicate", + ":T" = "Mercenary", "#T" = "Mercenary", ".T" = "Mercenary", ":U" = "Supply", "#U" = "Supply", ".U" = "Supply", //kinda localization -- rastaf0 @@ -37,7 +37,7 @@ var/list/department_radio_keys = list( ":ó" = "Engineering", "#ó" = "Engineering", ".ó" = "Engineering", ":û" = "Security", "#û" = "Security", ".û" = "Security", ":ö" = "whisper", "#ö" = "whisper", ".ö" = "whisper", - ":å" = "Syndicate", "#å" = "Syndicate", ".å" = "Syndicate", + ":å" = "Mercenary", "#å" = "Mercenary", ".å" = "Mercenary", ":é" = "Supply", "#é" = "Supply", ".é" = "Supply", ) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index cdca3b18ef..e3f73fae8f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -135,7 +135,7 @@ clear_supplied_laws() clear_inherent_laws() 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 << "Obey these laws:" laws.show_laws(src) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index c0f813635f..c158f1c0d3 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -811,7 +811,7 @@ var/list/robot_verbs_default = list( laws = new /datum/ai_laws/syndicate_override var/time = time2text(world.realtime,"hh:mm:ss") lawchanges.Add("[time] : [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." sleep(5) src << "\red Initiating diagnostics..." diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index c22bc58c88..c1af68c8df 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -369,7 +369,7 @@ return /obj/item/weapon/robot_module/syndicate - name = "syndicate robot module" + name = "illegal robot module" New() src.modules += new /obj/item/device/flashlight(src) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 937bec18e5..1d948aa89e 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -61,7 +61,7 @@ /obj/item/weapon/gun/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" w_class = 2.0 item_state = "crossbow" @@ -100,7 +100,7 @@ /obj/item/weapon/gun/energy/crossbow/largecrossbow name = "Energy Crossbow" - desc = "A weapon favored by syndicate infiltration teams." + desc = "A weapon favored by mercenary infiltration teams." w_class = 4.0 force = 10 matter = list("metal" = 200000)
Nuclear Disk(s)
[N.name], " diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index cfa61ba062..c4dc3a0e56 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -582,9 +582,9 @@ //Nuke Operative if(jobban_isbanned(M, "operative") || isbanned_dept) - jobs += "[replacetext("Nuke Operative", " ", " ")][replacetext("Mercenary", " ", " ")][replacetext("Nuke Operative", " ", " ")][replacetext("Mercenary", " ", " ")]