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

Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853

Browse Source 
[MIRROR] Fixes wrong circuits
This commit is contained in:
deathride58
2018-05-17 18:12:16 +00:00
committed by GitHub
parent baec90fe11 7c0182da95
commit 97b72c0289
6 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/circuitboards/computer_circuitboards.dm
+4
View File
@@ -154,6 +154,10 @@
name = "Labor Camp teleporter console (Computer Board)"
build_path = /obj/machinery/computer/gulag_teleporter_computer
/obj/item/circuitboard/computer/rdconsole/production
name = "R&D Console Production Only (Computer Board)"
build_path = /obj/machinery/computer/rdconsole/production
/obj/item/circuitboard/computer/rdconsole
name = "R&D Console (Computer Board)"
build_path = /obj/machinery/computer/rdconsole/core
code/game/objects/items/circuitboards/machine_circuitboards.dm
+7
View File
@@ -841,6 +841,13 @@
/obj/item/stack/sheet/glass = 1,
/obj/item/vending_refill/donksoft = 3)
/obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
name = "Syndicate Donksoft Toy Vendor (Machine Board)"
build_path = /obj/machinery/vending/toyliberationstation
req_components = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/vending_refill/donksoft = 3)
/obj/item/circuitboard/machine/dish_drive
name = "Dish Drive (Machine Board)"
build_path = /obj/machinery/dish_drive
code/modules/research/machinery/departmental_circuit_imprinter.dm
+1
View File
@@ -9,5 +9,6 @@
/obj/machinery/rnd/production/circuit_imprinter/department/science
name = "department circuit imprinter (Science)"
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science
allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
department_tag = "Science"
code/modules/research/rdconsole.dm
+1
View File
@@ -50,6 +50,7 @@ doesn't have toxins access.
var/research_control = TRUE
/obj/machinery/computer/rdconsole/production
circuit = /obj/item/circuitboard/computer/rdconsole/production
research_control = FALSE
/proc/CallMaterialName(ID)
code/modules/vending/liberation_toy.dm
+1
View File
@@ -6,6 +6,7 @@
product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!"
product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
vend_reply = "Come back for more!"
circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10,
/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10,
/obj/item/gun/ballistic/shotgun/toy/unrestricted = 10,
code/modules/vending/toys.dm
+1
View File
@@ -5,6 +5,7 @@
product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!"
product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
vend_reply = "Come back for more!"
circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor
products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10,
/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10,
/obj/item/gun/ballistic/shotgun/toy/unrestricted = 10,