Merge pull request #1915 from Citadel-Station-13/upstream-merge-29068

[MIRROR] Lowercased computer names
This commit is contained in:
LetterJay
2017-07-06 22:47:04 -05:00
committed by GitHub
8 changed files with 10 additions and 10 deletions
@@ -61,7 +61,7 @@
/////////////////////////////////////////////////////////////
/obj/machinery/computer/atmos_control
name = "Atmospherics Monitoring"
name = "atmospherics monitoring"
desc = "Used to monitor the station's atmospherics sensors."
icon_screen = "tank"
icon_keyboard = "atmos_key"
@@ -1,5 +1,5 @@
/obj/machinery/computer/launchpad
name = "\improper Launchpad Control Console"
name = "\improper launchpad control console"
desc = "Used to teleport objects to and from a launchpad."
icon_screen = "teleport"
icon_keyboard = "teleport_key"
@@ -3,7 +3,7 @@
GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","Echo","Foxtrot","Zero", "Niner"))
/obj/machinery/computer/telecrystals
name = "\improper Telecrystal assignment station"
name = "\improper telecrystal assignment station"
desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..."
icon_state = "tcstation"
icon_keyboard = "tcstation_key"
@@ -15,7 +15,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
/////////////////////////////////////////////
/obj/machinery/computer/telecrystals/uplinker
name = "\improper Telecrystal upload/receive station"
name = "\improper telecrystal upload/receive station"
desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \
you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
var/obj/item/uplinkholder = null
@@ -125,7 +125,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
/////////////////////////////////////////
/obj/machinery/computer/telecrystals/boss
name = "team Telecrystal management console"
name = "team telecrystal management console"
desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \
Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \
based on the danger rating of the mission."
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/machinery/computer/teleporter
name = "Teleporter Control Console"
name = "teleporter control console"
desc = "Used to control a linked teleportation Hub and Station."
icon_screen = "teleport"
icon_keyboard = "teleport_key"
+1 -1
View File
@@ -57,7 +57,7 @@
/**********************Shuttle Computer**************************/
/obj/machinery/computer/shuttle/mining
name = "Mining Shuttle Console"
name = "mining shuttle console"
desc = "Used to call and send the mining shuttle."
circuit = /obj/item/weapon/circuitboard/computer/mining_shuttle
shuttleId = "mining"
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/machinery/computer/shuttle
name = "Shuttle Console"
name = "shuttle console"
icon_screen = "shuttle"
icon_keyboard = "tech_key"
light_color = LIGHT_COLOR_CYAN
+1 -1
View File
@@ -236,7 +236,7 @@
origin_tech = "engineering=2;combat=2;bluespace=2"
/obj/machinery/computer/bsa_control
name = "Bluespace Artillery Control"
name = "bluespace artillery control"
var/obj/machinery/bsa/full/cannon
var/notice
var/target
+1 -1
View File
@@ -42,7 +42,7 @@
origin_tech = "engineering=3"
/obj/machinery/computer/sat_control
name = "Satellite control"
name = "satellite control"
desc = "Used to control the satellite network."
circuit = /obj/item/weapon/circuitboard/machine/computer/sat_control
var/notice