Replaces all references in game of the exodus with the nss aurora II (#2555)

Fixes #2501
Also, using cameras won't show exodus anymore
This commit is contained in:
Alberyk
2017-06-01 13:47:18 -03:00
committed by skull132
parent 03bf22eee6
commit 681a658890
10 changed files with 12 additions and 12 deletions

View File

@@ -37,7 +37,7 @@
#define NETWORK_ENGINEERING "Engineering"
#define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
#define NETWORK_ERT "ZeEmergencyResponseTeam"
#define NETWORK_EXODUS "Exodus"
#define NETWORK_STATION "Station"
#define NETWORK_MEDICAL "Medical"
#define NETWORK_MERCENARY "MercurialNet"
#define NETWORK_MINE "MINE"

View File

@@ -8,7 +8,7 @@
active_power_usage = 10
layer = 5
var/list/network = list(NETWORK_EXODUS)
var/list/network = list(NETWORK_STATION)
var/c_tag = null
var/c_tag_order = 999
var/status = 1
@@ -147,7 +147,7 @@
assembly.loc = src.loc
assembly.anchored = 1
assembly.camera_name = c_tag
assembly.camera_network = english_list(network, "Exodus", ",", ",")
assembly.camera_network = english_list(network, "Station", ",", ",")
assembly.update_icon()
assembly.dir = src.dir
if(stat & BROKEN)

View File

@@ -80,7 +80,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", camera_network ? camera_network : 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: Station,Security,Secret", "Set Network", camera_network ? camera_network : NETWORK_STATION))
if(!input)
usr << "No input found please hang up and try your call again."
return

View File

@@ -6,7 +6,7 @@ var/global/list/station_networks = list(
NETWORK_ENGINE,
NETWORK_ENGINEERING,
NETWORK_ENGINEERING_OUTPOST,
NETWORK_EXODUS,
NETWORK_STATION,
NETWORK_MEDICAL,
NETWORK_MINE,
NETWORK_RESEARCH,
@@ -47,7 +47,7 @@ var/global/list/engineering_networks = list(
network = list(NETWORK_ERT)
/obj/machinery/camera/network/exodus
network = list(NETWORK_EXODUS)
network = list(NETWORK_STATION)
/obj/machinery/camera/network/mining
network = list(NETWORK_MINE)

View File

@@ -207,7 +207,7 @@
"The Grinch","Cicilia Simon","John F. Kennedy","Joseph Dorn","Mendell City","Ta<54>Akaix<69>Scay<61>extiih<69>aur Zo<5A>ra","Ta'Akaix'Vaur'skiyet'sca Zo'ra","Miranda Trasen","Jiub","The Biesellian National Guard","The ERT","Baal D. Griffon","Hephaestus Industries","The Sol Alliance (Sorry about the blockade!")
var/pick_emotion = pick("love","platonic admiration","approval","love (not in a sexual way or anything, though)","apathy", "schadenfreude","love","God's blessing","Santa's blessing","Non-demoninational deity's blessing","love","compassion","appreciation",
"respect","begrudging respect","love")
desc = "To: The NSS Exodus<BR>From: <i>[gift_benefactor], with [pick_emotion]</i>"
desc = "To: The [station_name()]<BR>From: <i>[gift_benefactor], with [pick_emotion]</i>"
return

View File

@@ -60,7 +60,7 @@
/obj/item/clothing/suit/space
name = "space suit"
desc = "A suit that protects against low pressure environments. \"NSS EXODUS\" is written in large block letters on the back."
desc = "A suit that protects against low pressure environments. \"NSS AURORA II\" is written in large block letters on the back."
icon_state = "space"
item_state = "s_suit"
w_class = 4//bulky item

View File

@@ -49,7 +49,7 @@ var/list/ai_verbs_default = list(
density = 1
status_flags = CANSTUN|CANPARALYSE|CANPUSH
//shouldnt_see - set in New()
var/list/network = list("Exodus")
var/list/network = list("Station")
var/obj/machinery/camera/camera = null
var/list/connected_robots = list()
var/aiRestorePowerRoutine = 0

View File

@@ -15,7 +15,7 @@
idle_power_usage = 20
active_power_usage = 5000
var/fabricator_tag = "Exodus"
var/fabricator_tag = "Aurora"
var/drone_progress = 0
var/produce_drones = 1
var/time_last_drone = 500

View File

@@ -142,7 +142,7 @@
if(!scrambledcodes && !camera)
camera = new /obj/machinery/camera(src)
camera.c_tag = real_name
camera.replace_networks(list(NETWORK_EXODUS,NETWORK_ROBOTS))
camera.replace_networks(list(NETWORK_STATION,NETWORK_ROBOTS))
if(wires.IsIndexCut(BORG_WIRE_CAMERA))
camera.status = 0

View File

@@ -548,7 +548,7 @@
/obj/item/weapon/paper/sentencing/New()
info = {"\[center\]\[logo\]\[/center\]
\[center\]\[b\]\[i\]Operation of Criminal Sentencing Computers\[/b\]\[/i\]\[hr\]
\[small\]In compliance with new NanoTrasen criminal regulations, the \[b\]NSS Exodus\[/b\] has been equipped with state of the art sentencing computers. The operation of these terminals is quite simple:\[br\]
\[small\]In compliance with new NanoTrasen criminal regulations, the \[b\][station_name()]\[/b\] has been equipped with state of the art sentencing computers. The operation of these terminals is quite simple:\[br\]
\[br\]
While preparing a convicted individual, remove their ID and have the terminal scan it.\[br\]
Next, select all applicable charges from the menu available. The computer will calculate the sentence based on the minimum recommended sentence - any variables such as repeat offense will need to be manually accounted for.\[br\]