shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483

Browse Source 
[MIRROR] Fixes obj descs and adds missing ones
This commit is contained in:
LetterJay
2018-04-29 02:29:44 -05:00
committed by GitHub
parent 71b362e41e 0f020aa296
commit c287c3a84c
9 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/modular_computers/computers/machinery/console_presets.dm
View File

@@ -30,6 +30,7 @@
// ===== ENGINEERING CONSOLE =====
/obj/machinery/modular_computer/console/preset/engineering
console_department = "Engineering"
name = "engineering console"
desc = "A stationary computer. This one comes preloaded with engineering programs."
/obj/machinery/modular_computer/console/preset/engineering/install_programs()
@@ -41,6 +42,7 @@
// ===== RESEARCH CONSOLE =====
/obj/machinery/modular_computer/console/preset/research
console_department = "Research"
name = "research director's console"
desc = "A stationary computer. This one comes preloaded with research programs."
_has_ai = 1
@@ -59,6 +61,7 @@
// ===== COMMAND CONSOLE =====
/obj/machinery/modular_computer/console/preset/command
console_department = "Command"
name = "command console"
desc = "A stationary computer. This one comes preloaded with command programs."
_has_id_slot = 1
_has_printer = 1
@@ -75,6 +78,7 @@
// ===== CIVILIAN CONSOLE =====
/obj/machinery/modular_computer/console/preset/civilian
console_department = "Civilian"
name = "civilian console"
desc = "A stationary computer. This one comes preloaded with generic programs."
/obj/machinery/modular_computer/console/preset/civilian/install_programs()

2
code/modules/power/apc.dm
View File

@@ -40,7 +40,7 @@
/obj/machinery/power/apc
name = "area power controller"
desc = "A control terminal for the area electrical systems."
desc = "A control terminal for the area's electrical systems."
icon_state = "apc0"
anchored = TRUE

6
code/modules/research/machinery/departmental_circuit_imprinter.dm
View File

@@ -1,6 +1,6 @@
/obj/machinery/rnd/production/circuit_imprinter/department
name = "Department Circuit Imprinter"
desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
name = "department circuit imprinter"
desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
icon_state = "circuit_imprinter"
container_type = OPENCONTAINER
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
@@ -8,6 +8,6 @@
consoleless_interface = TRUE
/obj/machinery/rnd/production/circuit_imprinter/department/science
name = "department protolathe (Science)"
name = "department circuit imprinter (Science)"
allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
department_tag = "Science"

2
code/modules/research/machinery/departmental_protolathe.dm
View File

@@ -1,6 +1,6 @@
/obj/machinery/rnd/production/protolathe/department
name = "department protolathe"
desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
icon_state = "protolathe"
container_type = OPENCONTAINER
circuit = /obj/item/circuitboard/machine/protolathe/department

1
code/modules/stock_market/computer.dm
View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/stockexchange
name = "stock exchange computer"
desc = "A console that connects to the galactic stock market. Stocks trading involves substantial risk of loss and is not suitable for every cargo technician."
icon = 'icons/obj/computer.dmi'
icon_state = "oldcomp"
icon_screen = "stock_computer"