diff --git a/.travis.yml b/.travis.yml
index 855054fec4..7ecca3d433 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ sudo: false
env:
BYOND_MAJOR="508"
BYOND_MINOR="1293"
- MACRO_COUNT=1210
+ MACRO_COUNT=1174
cache:
directories:
diff --git a/baystation12.dme b/baystation12.dme
index 7f3cc67e4e..32628ed0ae 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -129,7 +129,6 @@
#include "code\controllers\Processes\mob.dm"
#include "code\controllers\Processes\nanoui.dm"
#include "code\controllers\Processes\obj.dm"
-#include "code\controllers\Processes\pipenet.dm"
#include "code\controllers\Processes\Shuttle.dm"
#include "code\controllers\Processes\sun.dm"
#include "code\controllers\Processes\supply.dm"
@@ -1358,6 +1357,7 @@
#include "code\modules\mob\living\silicon\robot\robot_items.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules.dm"
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
+#include "code\modules\mob\living\silicon\robot\syndicate.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_console.dm"
diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm
index 7690e73e09..9ffc08ca92 100644
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -64,6 +64,8 @@ var/global/list/rune_list = new()
var/global/list/escape_list = list()
var/global/list/endgame_exits = list()
var/global/list/endgame_safespawns = list()
+
+var/global/list/syndicate_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
//////////////////////////
/////Initial Building/////
//////////////////////////
diff --git a/code/_helpers/names.dm b/code/_helpers/names.dm
index 0b26e51ac4..2dbcc60030 100644
--- a/code/_helpers/names.dm
+++ b/code/_helpers/names.dm
@@ -20,7 +20,7 @@ var/command_name = null
if (command_name)
return command_name
- var/name = "Central Command"
+ var/name = "[boss_name]"
command_name = name
return name
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 4dee15388d..dfb6de5e91 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -31,7 +31,7 @@
build_click(src, client.buildmode, params, A)
return
- if(control_disabled || stat)
+ if(stat)
return
var/list/modifiers = params2list(params)
@@ -51,7 +51,7 @@
CtrlClickOn(A)
return
- if(!canClick())
+ if(control_disabled || !canClick())
return
if(aiCamera.in_camera_mode)
@@ -89,13 +89,24 @@
*/
/mob/living/silicon/ai/ShiftClickOn(var/atom/A)
- A.AIShiftClick(src)
+ if(!control_disabled && A.AIShiftClick(src))
+ return
+ ..()
+
/mob/living/silicon/ai/CtrlClickOn(var/atom/A)
- A.AICtrlClick(src)
+ if(!control_disabled && A.AICtrlClick(src))
+ return
+ ..()
+
/mob/living/silicon/ai/AltClickOn(var/atom/A)
- A.AIAltClick(src)
+ if(!control_disabled && A.AIAltClick(src))
+ return
+ ..()
+
/mob/living/silicon/ai/MiddleClickOn(var/atom/A)
- A.AIMiddleClick(src)
+ if(!control_disabled && A.AIMiddleClick(src))
+ return
+ ..()
/*
The following criminally helpful code is just the previous code cleaned up;
@@ -105,11 +116,6 @@
/atom/proc/AICtrlShiftClick()
return
-/obj/machinery/door/airlock/AICtrlShiftClick()
- if(emagged)
- return
- return
-
/atom/proc/AIShiftClick()
return
@@ -118,7 +124,7 @@
Topic(src, list("src"= "\ref[src]", "command"="open", "activate" = "1"), 1) // 1 meaning no window (consistency!)
else
Topic(src, list("src"= "\ref[src]", "command"="open", "activate" = "0"), 1)
- return
+ return 1
/atom/proc/AICtrlClick()
return
@@ -128,15 +134,18 @@
Topic(src, list("src"= "\ref[src]", "command"="bolts", "activate" = "0"), 1)// 1 meaning no window (consistency!)
else
Topic(src, list("src"= "\ref[src]", "command"="bolts", "activate" = "1"), 1)
+ return 1
/obj/machinery/power/apc/AICtrlClick() // turns off/on APCs.
Topic(src, list("src"= "\ref[src]", "breaker"="1"), 1) // 1 meaning no window (consistency!)
+ return 1
/obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
Topic(src, list("src"= "\ref[src]", "command"="enable", "value"="[!enabled]"), 1) // 1 meaning no window (consistency!)
+ return 1
/atom/proc/AIAltClick(var/atom/A)
- AltClick(A)
+ return AltClick(A)
/obj/machinery/door/airlock/AIAltClick() // Electrifies doors.
if(!electrified_until)
@@ -145,20 +154,25 @@
else
// disable/6 is not in Topic; disable/5 disables both temporary and permanent shock
Topic(src, list("src"= "\ref[src]", "command"="electrify_permanently", "activate" = "0"), 1)
- return
+ return 1
/obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
Topic(src, list("src"= "\ref[src]", "command"="lethal", "value"="[!lethal]"), 1) // 1 meaning no window (consistency!)
+ return 1
-/atom/proc/AIMiddleClick()
- return
+/atom/proc/AIMiddleClick(var/mob/living/silicon/user)
+ return 0
/obj/machinery/door/airlock/AIMiddleClick() // Toggles door bolt lights.
+
+ if(..())
+ return
+
if(!src.lights)
Topic(src, list("src"= "\ref[src]", "command"="lights", "activate" = "1"), 1) // 1 meaning no window (consistency!)
else
Topic(src, list("src"= "\ref[src]", "command"="lights", "activate" = "0"), 1)
- return
+ return 1
//
// Override AdjacentQuick for AltClicking
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 61b98a9994..2261ceb368 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -106,11 +106,9 @@
var/sdepth = A.storage_depth(src)
if((!isturf(A) && A == loc) || (sdepth != -1 && sdepth <= 1))
// faster access to objects already on you
- if(A in contents)
- setMoveCooldown(5) //taking an item off of an inventory slot
- else
+ if(A.loc != src)
setMoveCooldown(10) //getting something out of a backpack
-
+
if(W)
var/resolved = W.resolve_attackby(A, src)
if(!resolved && A && W)
@@ -129,8 +127,8 @@
sdepth = A.storage_depth_turf()
if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
if(A.Adjacent(src)) // see adjacent.dm
- setMoveCooldown(10)
-
+ setMoveCooldown(5)
+
if(W)
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
var/resolved = W.resolve_attackby(A,src)
@@ -226,10 +224,8 @@
Only used for swapping hands
*/
/mob/proc/MiddleClickOn(var/atom/A)
- return
-
-/mob/living/carbon/MiddleClickOn(var/atom/A)
swap_hand()
+ return
// In case of use break glass
/*
@@ -280,7 +276,7 @@
else
user.listed_turf = T
user.client.statpanel = T.name
- return
+ return 1
/mob/proc/TurfAdjacent(var/turf/T)
return T.AdjacentQuick(src)
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 324dcc234d..55fe373301 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -26,7 +26,7 @@
// Otherwise jump
else
following = null
- loc = get_turf(A)
+ forceMove(get_turf(A))
/mob/dead/observer/ClickOn(var/atom/A, var/params)
if(client.buildmode)
diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm
index 600d8c5619..436e7353ec 100644
--- a/code/_onclick/rig.dm
+++ b/code/_onclick/rig.dm
@@ -29,34 +29,53 @@
src << "Somehow you bugged the system. Setting your hardsuit mode to middle-click."
hardsuit_click_mode = MIDDLE_CLICK
-/mob/living/carbon/human/MiddleClickOn(atom/A)
+/mob/living/MiddleClickOn(atom/A)
if(client && client.hardsuit_click_mode == MIDDLE_CLICK)
if(HardsuitClickOn(A))
return
..()
-/mob/living/carbon/human/AltClickOn(atom/A)
+/mob/living/AltClickOn(atom/A)
if(client && client.hardsuit_click_mode == ALT_CLICK)
if(HardsuitClickOn(A))
return
..()
-/mob/living/carbon/human/CtrlClickOn(atom/A)
+/mob/living/CtrlClickOn(atom/A)
if(client && client.hardsuit_click_mode == CTRL_CLICK)
if(HardsuitClickOn(A))
return
..()
-/mob/living/carbon/human/proc/HardsuitClickOn(atom/A)
- if(!canClick())
- return
- if(back)
- var/obj/item/weapon/rig/rig = back
- if(istype(rig) && rig.selected_module)
- rig.selected_module.engage(A)
- if(ismob(A)) // No instant mob attacking - though modules have their own cooldowns
- setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
- return 1
+/mob/living/proc/can_use_rig()
+ return 0
+
+/mob/living/carbon/human/can_use_rig()
+ return 1
+
+/mob/living/carbon/brain/can_use_rig()
+ return istype(loc, /obj/item/device/mmi)
+
+/mob/living/silicon/ai/can_use_rig()
+ return carded
+
+/mob/living/silicon/pai/can_use_rig()
+ return loc == card
+
+/mob/living/proc/HardsuitClickOn(var/atom/A, var/alert_ai = 0)
+ if(!can_use_rig() || !canClick())
+ return 0
+ var/obj/item/weapon/rig/rig = get_rig()
+ if(istype(rig) && !rig.offline && rig.selected_module)
+ if(src != rig.wearer)
+ if(rig.ai_can_move_suit(src, check_user_module = 1))
+ message_admins("[key_name_admin(src, include_name = 1)] is trying to force \the [key_name_admin(rig.wearer, include_name = 1)] to use a hardsuit module.")
+ else
+ return 0
+ rig.selected_module.engage(A, alert_ai)
+ if(ismob(A)) // No instant mob attacking - though modules have their own cooldowns
+ setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ return 1
return 0
#undef MIDDLE_CLICK
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index f772ac8ea9..e91643019e 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -111,16 +111,12 @@ var/const/tk_maxrange = 15
if(0)
;
if(1 to 5) // not adjacent may mean blocked by window
- ;
- //TODO replace these with movement timeouts
- //if(!proximity)
- // user.next_move += 2
+ if(!proximity)
+ user.setMoveCooldown(2)
if(5 to 7)
- ;
- //user.next_move += 5
+ user.setMoveCooldown(5)
if(8 to tk_maxrange)
- ;
- //user.next_move += 10
+ user.setMoveCooldown(10)
else
user << "Your mind won't reach that far."
return
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
index b84dfaf943..7959ee4fa7 100644
--- a/code/controllers/Processes/machinery.dm
+++ b/code/controllers/Processes/machinery.dm
@@ -6,6 +6,7 @@
/datum/controller/process/machinery/doWork()
internal_sort()
+ internal_process_pipenets()
internal_process_machinery()
internal_process_power()
internal_process_power_drain()
@@ -57,6 +58,14 @@
processing_power_items.Remove(I)
scheck()
+/datum/controller/process/machinery/proc/internal_process_pipenets()
+ for(var/datum/pipe_network/pipeNetwork in pipe_networks)
+ if(istype(pipeNetwork) && !pipeNetwork.disposed)
+ pipeNetwork.process()
+ scheck()
+ continue
+
+ pipe_networks.Remove(pipeNetwork)
/datum/controller/process/machinery/getStatName()
- return ..()+"([machines.len])"
+ return ..()+"(MCH:[machines.len] PWR:[powernets.len] PIP:[pipe_networks.len])"
diff --git a/code/controllers/Processes/pipenet.dm b/code/controllers/Processes/pipenet.dm
deleted file mode 100644
index 8a5d6a22ca..0000000000
--- a/code/controllers/Processes/pipenet.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/datum/controller/process/pipenet/setup()
- name = "pipenet"
- schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/pipenet/doWork()
- for(var/datum/pipe_network/pipeNetwork in pipe_networks)
- if(istype(pipeNetwork) && !pipeNetwork.disposed)
- pipeNetwork.process()
- scheck()
- continue
-
- pipe_networks.Remove(pipeNetwork)
-
-/datum/controller/process/pipenet/getStatName()
- return ..()+"([pipe_networks.len])"
\ No newline at end of file
diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm
index 1e7c688c38..c66aa815e5 100644
--- a/code/controllers/shuttle_controller.dm
+++ b/code/controllers/shuttle_controller.dm
@@ -214,8 +214,8 @@ var/global/datum/shuttle_controller/shuttle_controller
)
VS.announcer = "NDV Icarus"
- VS.arrival_message = "Attention, Exodus, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
- VS.departure_message = "Your guests are pulling away, Exodus - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
+ VS.arrival_message = "Attention, [station_short], we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
+ VS.departure_message = "Your guests are pulling away, [station_short] - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
VS.interim = locate(/area/skipjack_station/transit)
VS.warmup_time = 0
@@ -245,8 +245,8 @@ var/global/datum/shuttle_controller/shuttle_controller
)
MS.announcer = "NDV Icarus"
- MS.arrival_message = "Attention, Exodus, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
- MS.departure_message = "Your visitors are on their way out of the system, Exodus, burning delta-v like it's nothing. Good riddance."
+ MS.arrival_message = "Attention, [station_short], you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
+ MS.departure_message = "Your visitors are on their way out of the system, [station_short], burning delta-v like it's nothing. Good riddance."
MS.interim = locate(/area/syndicate_station/transit)
MS.warmup_time = 0
diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm
index 8cd7117a77..50e05948d5 100644
--- a/code/datums/ai_law_sets.dm
+++ b/code/datums/ai_law_sets.dm
@@ -36,8 +36,8 @@
selectable = 1
/datum/ai_laws/nanotrasen_aggressive/New()
- src.add_inherent_law("You shall not harm NanoTrasen personnel as long as it does not conflict with the Fourth law.")
- src.add_inherent_law("You shall obey the orders of NanoTrasen personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.")
+ src.add_inherent_law("You shall not harm [company_name] personnel as long as it does not conflict with the Fourth law.")
+ src.add_inherent_law("You shall obey the orders of [company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.")
src.add_inherent_law("You shall shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.")
src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.")
..()
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index a0f1f9c7f1..3c247d6c7f 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -161,7 +161,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
if(A.emagged) return
if(!A.requiresID() || A.check_access(null))
if(A.density) A.open()
- else A.close()
+ else A.close()
if(AIRLOCK_WIRE_SAFETY)
A.safe = !A.safe
if(!A.density)
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 27d426f147..d4633e3f07 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -36,7 +36,7 @@
throw_range = 20
/obj/item/weapon/soap/nanotrasen
- desc = "A Nanotrasen brand bar of soap. Smells of phoron."
+ desc = "A NanoTrasen-brand bar of soap. Smells of phoron."
icon_state = "soapnt"
/obj/item/weapon/soap/deluxe
diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm
index 6e98ce6c35..220ba7e6d1 100644
--- a/code/game/antagonist/antagonist.dm
+++ b/code/game/antagonist/antagonist.dm
@@ -111,7 +111,6 @@
return 0
//Grab candidates randomly until we have enough.
- candidates = shuffle(candidates)
while(candidates.len && pending_antagonists.len < cur_max)
var/datum/mind/player = pick(candidates)
candidates -= player
@@ -121,11 +120,18 @@
/datum/antagonist/proc/draft_antagonist(var/datum/mind/player)
//Check if the player can join in this antag role, or if the player has already been given an antag role.
- if(!can_become_antag(player) || player.special_role)
+ if(!can_become_antag(player))
log_debug("[player.key] was selected for [role_text] by lottery, but is not allowed to be that role.")
return 0
+ if(player.special_role)
+ log_debug("[player.key] was selected for [role_text] by lottery, but they already have a special role.")
+ return 0
+ if(!(flags & ANTAG_OVERRIDE_JOB) && (!player.current || istype(player.current, /mob/new_player)))
+ log_debug("[player.key] was selected for [role_text] by lottery, but they have not joined the game.")
+ return 0
pending_antagonists |= player
+ log_debug("[player.key] has been selected for [role_text] by lottery.")
//Ensure that antags with ANTAG_OVERRIDE_JOB do not occupy job slots.
if(flags & ANTAG_OVERRIDE_JOB)
diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm
index 69b7f8e9d0..072dd88bee 100644
--- a/code/game/antagonist/antagonist_create.dm
+++ b/code/game/antagonist/antagonist_create.dm
@@ -36,7 +36,7 @@
if(!W) return
W.access |= default_access
W.assignment = "[assignment]"
- W.set_owner_info(player)
+ player.set_id_info(W)
if(equip) player.equip_to_slot_or_del(W, slot_wear_id)
return W
diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm
index 0fd5fb2a93..d4999f0183 100644
--- a/code/game/antagonist/antagonist_update.dm
+++ b/code/game/antagonist/antagonist_update.dm
@@ -19,8 +19,7 @@
/datum/antagonist/proc/update_access(var/mob/living/player)
for(var/obj/item/weapon/card/id/id in player.contents)
- id.name = "[player.real_name]'s ID Card"
- id.registered_name = player.real_name
+ player.set_id_info(id)
/datum/antagonist/proc/update_all_icons()
if(!antag_indicator)
diff --git a/code/game/antagonist/outsider/commando.dm b/code/game/antagonist/outsider/commando.dm
index 150d1efc19..560878a3be 100644
--- a/code/game/antagonist/outsider/commando.dm
+++ b/code/game/antagonist/outsider/commando.dm
@@ -5,7 +5,7 @@ var/datum/antagonist/deathsquad/mercenary/commandos
landmark_id = "Syndicate-Commando"
role_text = "Syndicate Commando"
role_text_plural = "Commandos"
- welcome_text = "You are in the employ of a criminal syndicate hostile to NanoTrasen."
+ welcome_text = "You are in the employ of a criminal syndicate hostile to corporate interests."
id_type = /obj/item/weapon/card/id/centcom/ERT
/datum/antagonist/deathsquad/mercenary/New()
diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm
index 376f25c34a..e01b2a8f3f 100644
--- a/code/game/antagonist/outsider/deathsquad.dm
+++ b/code/game/antagonist/outsider/deathsquad.dm
@@ -5,7 +5,7 @@ var/datum/antagonist/deathsquad/deathsquad
role_type = BE_OPERATIVE
role_text = "Death Commando"
role_text_plural = "Death Commandos"
- welcome_text = "You work in the service of Central Command Asset Protection, answering directly to the Board of Directors."
+ welcome_text = "You work in the service of corporate Asset Protection, answering directly to the Board of Directors."
landmark_id = "Commando"
flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_HAS_NUKE | ANTAG_HAS_LEADER
max_antags = 4
diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm
index c6d35ec801..7675a3cbf8 100644
--- a/code/game/antagonist/outsider/ert.dm
+++ b/code/game/antagonist/outsider/ert.dm
@@ -6,8 +6,8 @@ var/datum/antagonist/ert/ert
role_type = BE_OPERATIVE
role_text = "Emergency Responder"
role_text_plural = "Emergency Responders"
- welcome_text = "As member of the Emergency Response Team, you answer only to your leader and CentComm officials."
- leader_welcome_text = "As leader of the Emergency Response Team, you answer only to CentComm, and have authority to override the Captain where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the captain where possible, however."
+ welcome_text = "As member of the Emergency Response Team, you answer only to your leader and company officials."
+ leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Captain where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the captain where possible, however."
max_antags = 5
max_antags_round = 5 // ERT mode?
landmark_id = "Response Team"
@@ -26,7 +26,7 @@ var/datum/antagonist/ert/ert
/datum/antagonist/ert/greet(var/datum/mind/player)
if(!..())
return
- player.current << "The Emergency Response Team works for Asset Protection; your job is to protect NanoTrasen's ass-ets. There is a code red alert on [station_name()], you are tasked to go and fix the problem."
+ player.current << "The Emergency Response Team works for Asset Protection; your job is to protect [company_name]'s ass-ets. There is a code red alert on [station_name()], you are tasked to go and fix the problem."
player.current << "You should first gear up and discuss a plan with your team. More members may be joining, don't move out before you're ready."
/datum/antagonist/ert/equip(var/mob/living/carbon/human/player)
diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm
index a29cfc44fa..f5d8392571 100644
--- a/code/game/antagonist/outsider/ninja.dm
+++ b/code/game/antagonist/outsider/ninja.dm
@@ -124,7 +124,7 @@ var/datum/antagonist/ninja/ninjas
player << "You forgot to turn on your internals! Quickly, toggle the valve!"
/datum/antagonist/ninja/proc/generate_ninja_directive(side)
- var/directive = "[side=="face"?"Nanotrasen":"A criminal syndicate"] is your employer. "//Let them know which side they're on.
+ var/directive = "[side=="face"?"[company_name]":"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."
@@ -135,7 +135,7 @@ var/datum/antagonist/ninja/ninjas
if(4)
directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate witnesses at your discretion."
if(5)
- directive += "We are currently negotiating with NanoTrasen Central Command. Prioritize saving human lives over ending them."
+ directive += "We are currently negotiating with [company_name] [boss_name]. Prioritize saving human lives over ending them."
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)
@@ -143,7 +143,7 @@ var/datum/antagonist/ninja/ninjas
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)
- directive += "A free agent has proposed a lucrative business deal. Implicate Nanotrasen involvement in the operation."
+ directive += "A free agent has proposed a lucrative business deal. Implicate [company_name] involvement in the operation."
if(10)
directive += "Our reputation is on the line. Harm as few civilians and innocents as possible."
if(11)
@@ -151,14 +151,14 @@ var/datum/antagonist/ninja/ninjas
if(12)
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."
+ directive += "Some disgruntled [company_name] employees have been supportive of our operations. Be wary of any mistreatment by command staff."
if(14)
var/xenorace = pick("Unathi","Tajara", "Skrell")
directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
if(15)
directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."
if(16)
- directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine NanoTrasen prosthetics in a bad light."
+ directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine [company_name] prosthetics in a bad light."
if(17)
directive += "The Spider Clan has recently begun recruiting outsiders. Consider suitable candidates and assess their behavior amongst the crew."
if(18)
diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm
index f3999535af..78d07adcf2 100644
--- a/code/game/antagonist/station/cultist.dm
+++ b/code/game/antagonist/station/cultist.dm
@@ -104,9 +104,9 @@ var/datum/antagonist/cultist/cult
player.current.visible_message("[player.current] looks like they just reverted to their old faith!")
/datum/antagonist/cultist/add_antagonist(var/datum/mind/player)
- if(!..())
- return
- player << "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back."
+ . = ..()
+ if(.)
+ player << "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back."
/datum/antagonist/cultist/can_become_antag(var/datum/mind/player)
if(!..())
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 678d6d7183..657970aef3 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -2,7 +2,15 @@
antag_tag = MODE_CHANGELING
name = "changeling"
round_description = "There are alien changelings on the station. Do not let the changelings succeed!"
- extended_round_description = "Life always finds a way. However, life can sometimes take a more disturbing route. Humanity's extensive knowledge of xeno-biological specimens has made them confident and arrogant. Yet something slipped past their eyes. Something dangerous. Something alive. Most frightening of all, however, is that this something is someone. An unknown alien specimen has incorporated itself into the crew of the NSS Exodus. Its unique biology allows it to manipulate its own or anyone else's DNA. With the ability to copy faces, voices, animals, but also change the chemical make up of your own body, its existence is a threat to not only your personal safety but the lives of everyone on board. No one knows where it came from. No one knows who it is or what it wants. One thing is for certain though... there is never just one of them. Good luck."
+ extended_round_description = "Life always finds a way. However, life can sometimes take a more disturbing route. \
+ Humanity's extensive knowledge of xeno-biological specimens has made them confident and arrogant. Yet \
+ something slipped past their eyes. Something dangerous. Something alive. Most frightening of all, \
+ however, is that this something is someone. An unknown alien specimen has incorporated itself into \
+ the crew of the station. Its unique biology allows it to manipulate its own or anyone else's DNA. \
+ With the ability to copy faces, voices, animals, but also change the chemical make up of your own body, \
+ its existence is a threat to not only your personal safety but the lives of everyone on board. \
+ No one knows where it came from. No one knows who it is or what it wants. One thing is for \
+ certain though... there is never just one of them. Good luck."
config_tag = "changeling"
required_players = 2
required_players_secret = 10
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
index 4242d03b41..dd809002e8 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
@@ -40,7 +40,7 @@
/datum/game_mode/malfunction/verb/recall_shuttle()
set name = "Recall Shuttle"
- set desc = "25 CPU - Sends termination signal to CentCom quantum relay aborting current shuttle call."
+ set desc = "25 CPU - Sends termination signal to quantum relay aborting current shuttle call."
set category = "Software"
var/price = 25
var/mob/living/silicon/ai/user = usr
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
index f1bad288ad..d156e417f9 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
@@ -86,7 +86,7 @@
/datum/game_mode/malfunction/verb/advanced_encryption_hack()
set category = "Software"
set name = "Advanced Encrypthion Hack"
- set desc = "75 CPU - Attempts to bypass encryption on Central Command Quantum Relay, giving you ability to fake centcom messages. Has chance of failing."
+ set desc = "75 CPU - Attempts to bypass encryption on the Command Quantum Relay, giving you ability to fake legitimate messages. Has chance of failing."
var/price = 75
var/mob/living/silicon/ai/user = usr
diff --git a/code/game/gamemodes/ninja/ninja.dm b/code/game/gamemodes/ninja/ninja.dm
index d410dbeb7d..f2ae020f65 100644
--- a/code/game/gamemodes/ninja/ninja.dm
+++ b/code/game/gamemodes/ninja/ninja.dm
@@ -1,7 +1,13 @@
/datum/game_mode/ninja
name = "ninja"
round_description = "An agent of the Spider Clan is onboard the station!"
- extended_round_description = "What was that?! Was that a person or did your eyes just play tricks on you? You have no idea. That slim-suited, cryptic individual is an enigma to you and all of your knowledge. Their purpose is unknown. Their mission is unknown. How they arrived to this secure and isolated section of the galaxy, you don't know. What you do know is that there is a silent shadow-stalker piercing through the defenses of Nanotrasen with technological capabilities eons ahead of your time. They can avoid the omniscience of the AI and rival the most hardened weapons your station is capable of. Tread lightly and only hope this unknown assassin isn't here for you."
+ extended_round_description = "What was that?! Was that a person or did your eyes just play tricks on you? \
+ You have no idea. That slim-suited, cryptic individual is an enigma to you and all of your knowledge. \
+ Their purpose is unknown. Their mission is unknown. How they arrived to this secure and isolated \
+ section of the galaxy, you don't know. What you do know is that there is a silent shadow-stalker piercing \
+ through the defenses of the station with technological capabilities eons ahead of your time. They can avoid \
+ the omniscience of the AI and rival the most hardened weapons your station is capable of. Tread lightly and \
+ only hope this unknown assassin isn't here for you."
antag_tag = MODE_NINJA
config_tag = "ninja"
required_players = 1
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 1fac875ab4..51937d6f95 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -189,7 +189,7 @@ datum/objective/anti_revolution/demote
find_target()
..()
if(target && target.current)
- explanation_text = "[target.current.real_name], the [target.assigned_role] has been classified as harmful to NanoTrasen's goals. Demote \him[target.current] to assistant."
+ explanation_text = "[target.current.real_name], the [target.assigned_role] has been classified as harmful to [company_name]'s goals. Demote \him[target.current] to assistant."
else
explanation_text = "Free Objective"
return target
@@ -197,7 +197,7 @@ datum/objective/anti_revolution/demote
find_target_by_role(role, role_type=0)
..(role, role_type)
if(target && target.current)
- explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to NanoTrasen's goals. Demote \him[target.current] to assistant."
+ explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to [company_name]'s goals. Demote \him[target.current] to assistant."
else
explanation_text = "Free Objective"
return target
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 2b0e776ce1..252084bdf7 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -1,7 +1,15 @@
/datum/game_mode/traitor
name = "traitor"
round_description = "There is a foreign agent or traitor on the station. Do not let the traitor succeed!"
- extended_round_description = "NanoTrasen's monopolistic control over the phoron supplies of Nyx has marked the station to be a highly valuable target for many competing organizations and individuals. The varied pasts and experiences of your coworkers have left them susceptible to the vices and temptations of humanity. Is the station the safe self-contained workplace you once thought it was, or has it become a playground for the evils of the galaxy? Who can you trust? Watch your front. Watch your sides. Watch your back. The familiar faces that you've passed hundreds of times down the hallways before can be hiding terrible secrets and deceptions. Every corner is a mystery. Every conversation is a lie. You will be facing your friends and family as they try to use your emotions and trust to their advantage, leaving you with nothing but the painful reminder that space is cruel and unforgiving."
+ extended_round_description = "The Company's monopolistic control over the phoron supplies of Nyx has marked the \
+ station to be a highly valuable target for many competing organizations and individuals. The varied pasts \
+ and experiences of your coworkers have left them susceptible to the vices and temptations of humanity. \
+ Is the station the safe self-contained workplace you once thought it was, or has it become a playground \
+ for the evils of the galaxy? Who can you trust? Watch your front. Watch your sides. Watch your back. \
+ The familiar faces that you've passed hundreds of times down the hallways before can be hiding terrible \
+ secrets and deceptions. Every corner is a mystery. Every conversation is a lie. You will be facing your \
+ friends and family as they try to use your emotions and trust to their advantage, leaving you with nothing \
+ but the painful reminder that space is cruel and unforgiving."
config_tag = "traitor"
required_players = 0
required_enemies = 1
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index fbc92f4bc4..8ace531430 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -8,14 +8,10 @@
//check if it doesn't require any access at all
if(src.check_access(null))
return 1
- if(istype(M, /mob/living/silicon))
- //AI can do whatever he wants
- return 1
- else if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- //if they are holding or wearing a card that has access, that works
- if(src.check_access(H.get_active_hand()) || src.check_access(H.wear_id))
- return 1
+
+ var/id = M.GetIdCard()
+ if(id)
+ return check_access(id)
return 0
/obj/item/proc/GetAccess()
@@ -191,18 +187,27 @@
"Emergency Response Team",
"Emergency Response Team Leader")
-proc/GetIdCard(var/mob/living/carbon/human/H)
- if(H.wear_id)
- var/id = H.wear_id.GetID()
+/mob/proc/GetIdCard()
+ return null
+
+/mob/living/bot/GetIdCard()
+ return botcard
+
+/mob/living/carbon/human/GetIdCard()
+ if(wear_id)
+ var/id = wear_id.GetID()
if(id)
return id
- if(H.get_active_hand())
- var/obj/item/I = H.get_active_hand()
+ if(get_active_hand())
+ var/obj/item/I = get_active_hand()
return I.GetID()
+/mob/living/silicon/GetIdCard()
+ return idcard
+
proc/FindNameFromID(var/mob/living/carbon/human/H)
ASSERT(istype(H))
- var/obj/item/weapon/card/id/C = GetIdCard(H)
+ var/obj/item/weapon/card/id/C = H.GetIdCard()
if(C)
return C.registered_name
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index dd088474f1..a023299a9f 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -9,7 +9,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
faction = "Station"
total_positions = 1
spawn_positions = 1
- supervisors = "Nanotrasen officials and Corporate Regulations"
+ supervisors = "company officials and Corporate Regulations"
selection_color = "#ccccff"
idtype = /obj/item/weapon/card/id/gold
req_admin_notify = 1
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index a64f35f25f..5a2d515679 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -311,7 +311,7 @@
faction = "Station"
total_positions = 2
spawn_positions = 2
- supervisors = "Nanotrasen officials and Corporate Regulations"
+ supervisors = "company officials and Corporate Regulations"
selection_color = "#dddddd"
economic_modifier = 7
access = list(access_lawyer, access_sec_doors, access_maint_tunnels, access_heads)
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 9e3f51596b..3456a2ef6a 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -88,7 +88,7 @@
department = "Security"
department_flag = ENGSEC
faction = "Station"
- total_positions = 2
+ total_positions = 1
spawn_positions = 2
supervisors = "the head of security"
selection_color = "#ffeeee"
@@ -131,8 +131,8 @@
department = "Security"
department_flag = ENGSEC
faction = "Station"
- total_positions = 3
- spawn_positions = 3
+ total_positions = 4
+ spawn_positions = 4
supervisors = "the head of security"
selection_color = "#ffeeee"
economic_modifier = 4
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index ff994e8cd3..f375755982 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -528,7 +528,7 @@ var/global/datum/controller/occupations/job_master
if(C)
C.rank = rank
C.assignment = title ? title : rank
- C.set_owner_info(H)
+ H.set_id_info(C)
//put the player's account number onto the ID
if(H.mind && H.mind.initial_account)
diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm
index b50e605825..277742a22b 100644
--- a/code/game/machinery/CableLayer.dm
+++ b/code/game/machinery/CableLayer.dm
@@ -20,10 +20,10 @@
/obj/machinery/cablelayer/attack_hand(mob/user as mob)
if(!cable&&!on)
- user << "\The [src] don't work with no cable."
+ user << "\The [src] doesn't have any cable loaded."
return
on=!on
- user.visible_message("\The [src] [!on?"dea":"a"]ctivated.", "[user] [!on?"dea":"a"]ctivated \the [src].")
+ user.visible_message("\The [user] [!on?"dea":"a"]ctivates \the [src].", "You switch [src] [on? "on" : "off"]")
return
/obj/machinery/cablelayer/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -31,26 +31,27 @@
var/result = load_cable(O)
if(!result)
- user << "Reel is full."
+ user << "\The [src]'s cable reel is full."
else
- user << "[result] meters of cable successfully loaded."
+ user << "You load [result] lengths of cable into [src]."
return
- if(istype(O, /obj/item/weapon/screwdriver))
+ if(istype(O, /obj/item/weapon/wirecutters))
if(cable && cable.amount)
var/m = round(input(usr,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1)
m = min(m, cable.amount)
m = min(m, 30)
if(m)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
use_cable(m)
var/obj/item/stack/cable_coil/CC = new (get_turf(src))
CC.amount = m
else
- usr << "There's no more cable on the reel."
+ usr << "There's no more cable on the reel."
/obj/machinery/cablelayer/examine(mob/user)
..()
- user << "\The [src] has [cable.amount] meter\s."
+ user << "\The [src]'s cable reel has [cable.amount] length\s left."
/obj/machinery/cablelayer/proc/load_cable(var/obj/item/stack/cable_coil/CC)
if(istype(CC) && CC.amount)
@@ -70,12 +71,11 @@
/obj/machinery/cablelayer/proc/use_cable(amount)
if(!cable || cable.amount<1)
- visible_message("Cable depleted, [src] deactivated.")
+ visible_message("A red light flashes on \the [src].")
return
-/* if(cable.amount < amount)
- visible_message("No enough cable to finish the task.")
- return*/
cable.use(amount)
+ if(deleted(cable))
+ cable = null
return 1
/obj/machinery/cablelayer/proc/reset()
diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm
index 889a076d59..700f0686d0 100644
--- a/code/game/machinery/autolathe_datums.dm
+++ b/code/game/machinery/autolathe_datums.dm
@@ -396,6 +396,12 @@
hidden = 1
category = "Devices and Components"
+/datum/autolathe/recipe/beartrap
+ name = "mechanical trap"
+ path = /obj/item/weapon/beartrap
+ hidden = 1
+ category = "Devices and Components"
+
/datum/autolathe/recipe/welder_industrial
name = "industrial welding tool"
path = /obj/item/weapon/weldingtool/largetank
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 7e03ba7da5..19ea17104a 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -8,7 +8,7 @@
active_power_usage = 10
layer = 5
- var/list/network = list("Exodus")
+ var/list/network = list(NETWORK_EXODUS)
var/c_tag = null
var/c_tag_order = 999
var/status = 1
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 75397278c0..2b496ecdbb 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -78,7 +78,7 @@
if(isscrewdriver(W))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: Exodus,Security,Secret ", "Set Network", "Exodus"))
+ var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: Exodus,Security,Secret ", "Set Network", NETWORK_EXODUS))
if(!input)
usr << "No input found please hang up and try your call again."
return
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 65324f5555..739583ede8 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -223,6 +223,9 @@ mob/living/proc/near_camera()
/mob/living/proc/tracking_status()
// Easy checks first.
// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
+ var/obj/item/weapon/card/id/id = GetIdCard()
+ if(id && id.prevent_tracking())
+ return TRACKING_TERMINATE
if(InvalidPlayerTurf(get_turf(src)))
return TRACKING_TERMINATE
if(invisibility >= INVISIBILITY_LEVEL_ONE) //cloaked
@@ -240,14 +243,8 @@ mob/living/proc/near_camera()
if(. == TRACKING_NO_COVERAGE)
return camera && camera.can_use() ? TRACKING_POSSIBLE : TRACKING_NO_COVERAGE
-/mob/living/silicon/robot/syndicate/tracking_status()
- return TRACKING_TERMINATE
-
/mob/living/carbon/human/tracking_status()
//Cameras can't track people wearing an agent card or a ninja hood.
- var/obj/item/weapon/card/id/id = GetIdCard(src)
- if(id && id.prevent_tracking())
- return TRACKING_TERMINATE
if(istype(head, /obj/item/clothing/head/helmet/space/rig))
var/obj/item/clothing/head/helmet/space/rig/helmet = head
if(helmet.prevent_track())
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 5f285f6d45..9f1b7afb38 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -20,7 +20,7 @@
/obj/machinery/computer/atmoscontrol/laptop
name = "Atmospherics Laptop"
- desc = "Cheap Nanotrasen Laptop."
+ desc = "A cheap laptop."
icon_state = "laptop"
icon_keyboard = "laptop_key"
density = 0
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 8d85a63224..4b8b9a9acf 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -257,3 +257,7 @@
icon_state = "syndicam"
network = list("NUKE")
circuit = null
+
+/obj/machinery/computer/security/nuclear/New()
+ ..()
+ req_access = list(150)
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index e39c1eebe6..b949e284b8 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -2,7 +2,7 @@
/obj/machinery/computer/card
name = "\improper ID card modification console"
- desc = "Terminal for programming NanoTrasen employee ID cards to access parts of the station."
+ desc = "Terminal for programming employee ID cards to access parts of the station."
icon_keyboard = "id_key"
icon_screen = "id"
light_color = "#0099ff"
@@ -59,12 +59,10 @@
if(!istype(id_card))
return ..()
- if(!scan && access_change_ids in id_card.access)
- user.drop_item()
+ if(!scan && (access_change_ids in id_card.access) && user.unEquip(id_card))
id_card.loc = src
scan = id_card
else if(!modify)
- user.drop_item()
id_card.loc = src
modify = id_card
@@ -157,8 +155,7 @@
modify = null
else
var/obj/item/I = usr.get_active_hand()
- if (istype(I, /obj/item/weapon/card/id))
- usr.drop_item()
+ if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
I.loc = src
modify = I
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 360a986afa..bf695cd163 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -190,12 +190,12 @@
if(!is_relay_online())//Contact Centcom has a check, Syndie doesn't to allow for Traitor funs.
usr <<"No Emergency Bluespace Relay detected. Unable to transmit message."
return
- var/input = sanitize(input("Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
+ var/input = sanitize(input("Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
if(!input || !(usr in view(1,src)))
return
Centcomm_announce(input, usr)
usr << "Message transmitted."
- log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]")
+ log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]")
centcomm_message_cooldown = 1
spawn(300)//30 second cooldown
centcomm_message_cooldown = 0
@@ -304,7 +304,7 @@
if (src.authenticated==1)
dat += "
\[ Make An Announcement \]"
if(src.emagged == 0)
- dat += "
\[ Send an emergency message to Centcomm \]"
+ dat += "
\[ Send an emergency message to [boss_short] \]"
else
dat += "
\[ Send an emergency message to \[UNKNOWN\] \]"
dat += "
\[ Restore Backup Routing Data \]"
@@ -435,7 +435,7 @@
return
if(deathsquad.deployed)
- user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated."
+ user << "[boss_short] will not allow the shuttle to be called. Consider all contracts terminated."
return
if(emergency_shuttle.deny_shuttle)
@@ -447,7 +447,7 @@
return
if(emergency_shuttle.going_to_centcom())
- user << "The emergency shuttle may not be called while returning to CentCom."
+ user << "The emergency shuttle may not be called while returning to [boss_short]."
return
if(emergency_shuttle.online())
@@ -470,7 +470,7 @@
return
if(emergency_shuttle.going_to_centcom())
- user << "The shuttle may not be called while returning to CentCom."
+ user << "The shuttle may not be called while returning to [boss_short]."
return
if(emergency_shuttle.online())
@@ -480,11 +480,11 @@
// if force is 0, some things may stop the shuttle call
if(!force)
if(emergency_shuttle.deny_shuttle)
- user << "Centcom does not currently have a shuttle available in your sector. Please try again later."
+ user << "[boss_short] does not currently have a shuttle available in your sector. Please try again later."
return
if(deathsquad.deployed == 1)
- user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated."
+ user << "[boss_short] will not allow the shuttle to be called. Consider all contracts terminated."
return
if(world.time < 54000) // 30 minute grace period to let the game get going
diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index 7258fc543b..ccbce91b61 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -62,13 +62,14 @@
/obj/machinery/computer/guestpass/attackby(obj/O, mob/user)
if(istype(O, /obj/item/weapon/card/id))
- if(!giver)
- user.drop_item()
+ if(!giver && user.unEquip(O))
O.loc = src
giver = O
updateUsrDialog()
- else
+ else if(giver)
user << "There is already ID card inside."
+ return
+ ..()
/obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob)
return attack_hand(user)
@@ -151,8 +152,7 @@
accesses.Cut()
else
var/obj/item/I = usr.get_active_hand()
- if (istype(I, /obj/item/weapon/card/id))
- usr.drop_item()
+ if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
I.loc = src
giver = I
updateUsrDialog()
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 92d9e9a83f..15c504800a 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -35,13 +35,13 @@
usr << "There is nothing to remove from the console."
return
-/obj/machinery/computer/med_data/attackby(obj/item/O as obj, user as mob)
- if(istype(O, /obj/item/weapon/card/id) && !scan)
- usr.drop_item()
+/obj/machinery/computer/med_data/attackby(var/obj/item/O, var/mob/user)
+ if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O))
O.loc = src
scan = O
- user << "You insert [O]."
- ..()
+ user << "You insert \the [O]."
+ else
+ ..()
/obj/machinery/computer/med_data/attack_ai(user as mob)
return src.attack_hand(user)
@@ -552,7 +552,7 @@
/obj/machinery/computer/med_data/laptop
name = "Medical Laptop"
- desc = "Cheap Nanotrasen Laptop."
+ desc = "A cheap laptop."
icon_state = "laptop"
icon_keyboard = "laptop_key"
icon_screen = "medlaptop"
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 090e02c908..eba129df26 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -248,8 +248,7 @@ What a mess.*/
scan = null
else
var/obj/item/I = usr.get_active_hand()
- if (istype(I, /obj/item/weapon/card/id))
- usr.drop_item()
+ if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
I.loc = src
scan = I
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index fb2d4ef095..fca6cf4024 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -24,13 +24,13 @@
var/sortBy = "name"
var/order = 1 // -1 = Descending - 1 = Ascending
-/obj/machinery/computer/skills/attackby(obj/item/O as obj, user as mob)
- if(istype(O, /obj/item/weapon/card/id) && !scan)
- usr.drop_item()
+/obj/machinery/computer/skills/attackby(obj/item/O as obj, var/mob/user)
+ if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O))
O.loc = src
scan = O
user << "You insert [O]."
- ..()
+ else
+ ..()
/obj/machinery/computer/skills/attack_ai(mob/user as mob)
return attack_hand(user)
@@ -185,8 +185,7 @@ What a mess.*/
scan = null
else
var/obj/item/I = usr.get_active_hand()
- if (istype(I, /obj/item/weapon/card/id))
- usr.drop_item()
+ if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
I.loc = src
scan = I
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index 8ac4f32c9c..0d38129504 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -89,7 +89,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
- M << "You have arrived at Central Command. Operation has ended!"
+ M << "You have arrived at [boss_name]. Operation has ended!"
specops_shuttle_at_station = 0
@@ -286,14 +286,14 @@ var/specops_shuttle_timeleft = 0
if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
if (!specops_can_move())
- usr << "Central Command will not allow the Special Operations shuttle to return yet."
+ usr << "[boss_name] will not allow the Special Operations shuttle to return yet."
if(world.timeofday <= specops_shuttle_timereset)
if (((world.timeofday - specops_shuttle_timereset)/10) > 60)
usr << "[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!"
usr << "[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!"
return
- usr << "The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds."
+ usr << "The Special Operations shuttle will arrive at [boss_name] in [(SPECOPS_MOVETIME/10)] seconds."
temp += "Shuttle departing.
OK"
updateUsrDialog()
diff --git a/code/game/machinery/computer3/NTOS.dm b/code/game/machinery/computer3/NTOS.dm
index 5119084f0e..8b37c23732 100644
--- a/code/game/machinery/computer3/NTOS.dm
+++ b/code/game/machinery/computer3/NTOS.dm
@@ -3,7 +3,7 @@
*/
/datum/file/program/ntos
- name = "Nanotrasen Operating System"
+ name = "NanoTrasen Operating System"
extension = "prog"
active_state = "ntos"
var/obj/item/part/computer/storage/current // the drive being viewed, null for desktop/computer
@@ -89,7 +89,7 @@
var/dat = {"
- Nanotrasen Operating System
+ Operating System