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

Merge pull request #5374 from Citadel-Station-13/upstream-merge-35412

Browse Source 
[MIRROR] Brings certain designs in line with others.
This commit is contained in:
deathride58
2018-02-08 16:25:30 +00:00
committed by GitHub
parent b363799535 c68a2f652c
commit 83b0a656ea
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/comp_board_designs.dm
-2
View File
@@ -12,7 +12,6 @@
id = "arcade_battle" id = "arcade_battle"
build_path = /obj/item/circuitboard/computer/arcade/battle build_path = /obj/item/circuitboard/computer/arcade/battle
category = list("Computer Boards") category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/orion_trail /datum/design/board/orion_trail
name = "Computer Design (Orion Trail Arcade Machine)" name = "Computer Design (Orion Trail Arcade Machine)"
@@ -20,7 +19,6 @@
id = "arcade_orion" id = "arcade_orion"
build_path = /obj/item/circuitboard/computer/arcade/orion_trail build_path = /obj/item/circuitboard/computer/arcade/orion_trail
category = list("Computer Boards") category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/seccamera /datum/design/board/seccamera
name = "Computer Design (Security Camera)" name = "Computer Design (Security Camera)"
code/modules/research/designs/stock_parts_designs.dm
+1
View File
@@ -275,6 +275,7 @@
materials = list(MAT_METAL = 100, MAT_GOLD = 100, MAT_URANIUM = 100) materials = list(MAT_METAL = 100, MAT_GOLD = 100, MAT_URANIUM = 100)
build_path = /obj/item/stock_parts/subspace/amplifier build_path = /obj/item/stock_parts/subspace/amplifier
category = list("Stock Parts") category = list("Stock Parts")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/subspace_treatment /datum/design/subspace_treatment
name = "Subspace Treatment Disk" name = "Subspace Treatment Disk"
code/modules/research/designs/telecomms_designs.dm
+7
View File
@@ -8,6 +8,7 @@
id = "s-receiver" id = "s-receiver"
build_path = /obj/item/circuitboard/machine/telecomms/receiver build_path = /obj/item/circuitboard/machine/telecomms/receiver
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/telecomms_bus /datum/design/board/telecomms_bus
name = "Machine Design (Bus Mainframe)" name = "Machine Design (Bus Mainframe)"
@@ -15,6 +16,7 @@
id = "s-bus" id = "s-bus"
build_path = /obj/item/circuitboard/machine/telecomms/bus build_path = /obj/item/circuitboard/machine/telecomms/bus
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/telecomms_hub /datum/design/board/telecomms_hub
name = "Machine Design (Hub Mainframe)" name = "Machine Design (Hub Mainframe)"
@@ -22,6 +24,7 @@
id = "s-hub" id = "s-hub"
build_path = /obj/item/circuitboard/machine/telecomms/hub build_path = /obj/item/circuitboard/machine/telecomms/hub
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/telecomms_relay /datum/design/board/telecomms_relay
name = "Machine Design (Relay Mainframe)" name = "Machine Design (Relay Mainframe)"
@@ -29,6 +32,7 @@
id = "s-relay" id = "s-relay"
build_path = /obj/item/circuitboard/machine/telecomms/relay build_path = /obj/item/circuitboard/machine/telecomms/relay
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/telecomms_processor /datum/design/board/telecomms_processor
name = "Machine Design (Processor Unit)" name = "Machine Design (Processor Unit)"
@@ -36,6 +40,7 @@
id = "s-processor" id = "s-processor"
build_path = /obj/item/circuitboard/machine/telecomms/processor build_path = /obj/item/circuitboard/machine/telecomms/processor
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/telecomms_server /datum/design/board/telecomms_server
name = "Machine Design (Server Mainframe)" name = "Machine Design (Server Mainframe)"
@@ -43,6 +48,7 @@
id = "s-server" id = "s-server"
build_path = /obj/item/circuitboard/machine/telecomms/server build_path = /obj/item/circuitboard/machine/telecomms/server
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/subspace_broadcaster /datum/design/board/subspace_broadcaster
name = "Machine Design (Subspace Broadcaster)" name = "Machine Design (Subspace Broadcaster)"
@@ -50,3 +56,4 @@
id = "s-broadcaster" id = "s-broadcaster"
build_path = /obj/item/circuitboard/machine/telecomms/broadcaster build_path = /obj/item/circuitboard/machine/telecomms/broadcaster
category = list("Subspace Telecomms") category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
code/modules/research/designs/weapon_designs.dm
+1
View File
@@ -192,6 +192,7 @@
id = "mag_oldsmg_ap" id = "mag_oldsmg_ap"
materials = list(MAT_METAL = 6000, MAT_SILVER = 600) materials = list(MAT_METAL = 6000, MAT_SILVER = 600)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtap build_path = /obj/item/ammo_box/magazine/wt550m9/wtap
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/mag_oldsmg/ic_mag /datum/design/mag_oldsmg/ic_mag
name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)"