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

[MIRROR] Techweb fixes (#6023)

Browse Source 
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
This commit is contained in:
CitadelStationBot
2018-03-19 21:18:35 -05:00
committed by Poojawa
parent b74454bf5c
commit 9338d18a28
6 changed files with 97 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/comp_board_designs.dm
+30 -1
View File
@@ -12,6 +12,7 @@
id = "arcade_battle"
build_path = /obj/item/circuitboard/computer/arcade/battle
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/orion_trail
name = "Computer Design (Orion Trail Arcade Machine)"
@@ -19,6 +20,7 @@
id = "arcade_orion"
build_path = /obj/item/circuitboard/computer/arcade/orion_trail
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/seccamera
name = "Computer Design (Security Camera)"
@@ -26,6 +28,7 @@
id = "seccamera"
build_path = /obj/item/circuitboard/computer/security
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/xenobiocamera
name = "Computer Design (Xenobiology Console)"
@@ -41,6 +44,7 @@
id = "aiupload"
build_path = /obj/item/circuitboard/computer/aiupload
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/borgupload
name = "Computer Design (Cyborg Upload)"
@@ -48,6 +52,7 @@
id = "borgupload"
build_path = /obj/item/circuitboard/computer/borgupload
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/med_data
name = "Computer Design (Medical Records)"
@@ -55,6 +60,7 @@
id = "med_data"
build_path = /obj/item/circuitboard/computer/med_data
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/board/operating
name = "Computer Design (Operating Computer)"
@@ -62,6 +68,7 @@
id = "operating"
build_path = /obj/item/circuitboard/computer/operating
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/pandemic
name = "Computer Design (PanD.E.M.I.C. 2200)"
@@ -69,6 +76,7 @@
id = "pandemic"
build_path = /obj/item/circuitboard/computer/pandemic
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/board/scan_console
name = "Computer Design (DNA Machine)"
@@ -76,6 +84,7 @@
id = "scan_console"
build_path = /obj/item/circuitboard/computer/scan_consolenew
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/comconsole
name = "Computer Design (Communications)"
@@ -83,6 +92,7 @@
id = "comconsole"
build_path = /obj/item/circuitboard/computer/communications
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime.
/datum/design/board/idcardconsole
name = "Computer Design (ID Console)"
@@ -90,6 +100,7 @@
id = "idcardconsole"
build_path = /obj/item/circuitboard/computer/card
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime.
/datum/design/board/crewconsole
name = "Computer Design (Crew monitoring computer)"
@@ -97,6 +108,7 @@
id = "crewconsole"
build_path = /obj/item/circuitboard/computer/crew
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL
/datum/design/board/secdata
name = "Computer Design (Security Records Console)"
@@ -104,6 +116,7 @@
id = "secdata"
build_path = /obj/item/circuitboard/computer/secure_data
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/atmosalerts
name = "Computer Design (Atmosphere Alert)"
@@ -111,6 +124,7 @@
id = "atmosalerts"
build_path = /obj/item/circuitboard/computer/atmos_alert
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/atmos_control
name = "Computer Design (Atmospheric Monitor)"
@@ -118,6 +132,7 @@
id = "atmos_control"
build_path = /obj/item/circuitboard/computer/atmos_control
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/robocontrol
name = "Computer Design (Robotics Control Console)"
@@ -125,6 +140,7 @@
id = "robocontrol"
build_path = /obj/item/circuitboard/computer/robotics
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/slot_machine
name = "Computer Design (Slot Machine)"
@@ -132,6 +148,7 @@
id = "slotmachine"
build_path = /obj/item/circuitboard/computer/slot_machine
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/powermonitor
name = "Computer Design (Power Monitor)"
@@ -139,6 +156,7 @@
id = "powermonitor"
build_path = /obj/item/circuitboard/computer/powermonitor
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/solarcontrol
name = "Computer Design (Solar Control)"
@@ -146,6 +164,7 @@
id = "solarcontrol"
build_path = /obj/item/circuitboard/computer/solar_control
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/prisonmanage
name = "Computer Design (Prisoner Management Console)"
@@ -153,6 +172,7 @@
id = "prisonmanage"
build_path = /obj/item/circuitboard/computer/prisoner
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/mechacontrol
name = "Computer Design (Exosuit Control Console)"
@@ -184,6 +204,7 @@
id = "cargo"
build_path = /obj/item/circuitboard/computer/cargo
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/board/cargorequest
name = "Computer Design (Supply Request Console)"
@@ -191,13 +212,15 @@
id = "cargorequest"
build_path = /obj/item/circuitboard/computer/cargo/request
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/board/stockexchange
name = "Computer Design (Stock Exchange Console)"
desc = "Allows for the construction of circuit boards used to build a Stock Exchange Console."
id = "stockexchange"
build_path = /obj/item/circuitboard/computer/stockexchange
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/board/mining
name = "Computer Design (Outpost Status Display)"
@@ -205,6 +228,7 @@
id = "mining"
build_path = /obj/item/circuitboard/computer/mining
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/comm_monitor
name = "Computer Design (Telecommunications Monitoring Console)"
@@ -212,6 +236,7 @@
id = "comm_monitor"
build_path = /obj/item/circuitboard/computer/comm_monitor
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/comm_server
name = "Computer Design (Telecommunications Server Monitoring Console)"
@@ -219,6 +244,7 @@
id = "comm_server"
build_path = /obj/item/circuitboard/computer/comm_server
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/message_monitor
name = "Computer Design (Messaging Monitor Console)"
@@ -226,6 +252,7 @@
id = "message_monitor"
build_path = /obj/item/circuitboard/computer/message_monitor
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/aifixer
name = "Computer Design (AI Integrity Restorer)"
@@ -241,6 +268,7 @@
id = "libraryconsole"
build_path = /obj/item/circuitboard/computer/libraryconsole
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/apc_control
name = "Computer Design (APC Control)"
@@ -248,3 +276,4 @@
id = "apc_control"
build_path = /obj/item/circuitboard/computer/apc_control
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
code/modules/research/designs/machine_designs.dm
+45 -12
View File
@@ -8,6 +8,7 @@
id = "smes"
build_path = /obj/item/circuitboard/machine/smes
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/announcement_system
name = "Machine Design (Automated Announcement System Board)"
@@ -15,6 +16,7 @@
id = "automated_announcement"
build_path = /obj/item/circuitboard/machine/announcement_system
category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/turbine_computer
name = "Computer Design (Power Turbine Console Board)"
@@ -22,6 +24,7 @@
id = "power_turbine_console"
build_path = /obj/item/circuitboard/computer/turbine_computer
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/emitter
name = "Machine Design (Emitter Board)"
@@ -29,6 +32,7 @@
id = "emitter"
build_path = /obj/item/circuitboard/machine/emitter
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/power_compressor
name = "Machine Design (Power Compressor Board)"
@@ -36,6 +40,7 @@
id = "power_compressor"
build_path = /obj/item/circuitboard/machine/power_compressor
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/power_turbine
name = "Machine Design (Power Turbine Board)"
@@ -43,6 +48,7 @@
id = "power_turbine"
build_path = /obj/item/circuitboard/machine/power_turbine
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/thermomachine
name = "Machine Design (Freezer/Heater Board)"
@@ -50,6 +56,7 @@
id = "thermomachine"
build_path = /obj/item/circuitboard/machine/thermomachine
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/space_heater
name = "Machine Design (Space Heater Board)"
@@ -57,6 +64,7 @@
id = "space_heater"
build_path = /obj/item/circuitboard/machine/space_heater
category = list ("Engineering Machinery")
departmental_flags = ALL
/datum/design/board/teleport_station
name = "Machine Design (Teleportation Station Board)"
@@ -64,7 +72,7 @@
id = "tele_station"
build_path = /obj/item/circuitboard/machine/teleporter_station
category = list ("Teleportation Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/teleport_hub
name = "Machine Design (Teleportation Hub Board)"
@@ -72,7 +80,7 @@
id = "tele_hub"
build_path = /obj/item/circuitboard/machine/teleporter_hub
category = list ("Teleportation Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/quantumpad
name = "Machine Design (Quantum Pad Board)"
@@ -80,7 +88,7 @@
id = "quantumpad"
build_path = /obj/item/circuitboard/machine/quantumpad
category = list ("Teleportation Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/launchpad
name = "Machine Design (Bluespace Launchpad Board)"
@@ -88,7 +96,7 @@
id = "launchpad"
build_path = /obj/item/circuitboard/machine/launchpad
category = list ("Teleportation Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/launchpad_console
name = "Machine Design (Bluespace Launchpad Console Board)"
@@ -96,7 +104,7 @@
id = "launchpad_console"
build_path = /obj/item/circuitboard/computer/launchpad_console
category = list ("Teleportation Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/teleconsole
name = "Computer Design (Teleporter Console)"
@@ -104,7 +112,7 @@
id = "teleconsole"
build_path = /obj/item/circuitboard/computer/teleporter
category = list("Teleportation Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/sleeper
name = "Machine Design (Sleeper Board)"
@@ -152,6 +160,7 @@
id = "smoke_machine"
build_path = /obj/item/circuitboard/machine/smoke_machine
category = list ("Medical Machinery")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/board/reagentgrinder
name = "Machine Design (All-In-One Grinder)"
@@ -159,20 +168,21 @@
id = "reagentgrinder"
build_path = /obj/item/circuitboard/machine/reagentgrinder
category = list ("Medical Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/clonecontrol
name = "Computer Design (Cloning Machine Console)"
desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console."
id = "clonecontrol"
build_path = /obj/item/circuitboard/computer/cloning
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
category = list("Medical Machinery")
/datum/design/board/clonepod
name = "Machine Design (Clone Pod)"
desc = "Allows for the construction of circuit boards used to build a Cloning Pod."
id = "clonepod"
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
build_path = /obj/item/circuitboard/machine/clonepod
category = list("Medical Machinery")
@@ -180,7 +190,7 @@
name = "Machine Design (Cloning Scanner)"
desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
id = "clonescanner"
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
build_path = /obj/item/circuitboard/machine/clonescanner
category = list("Medical Machinery")
@@ -190,6 +200,7 @@
id = "biogenerator"
build_path = /obj/item/circuitboard/machine/biogenerator
category = list ("Hydroponics Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/hydroponics
name = "Machine Design (Hydroponics Tray Board)"
@@ -197,6 +208,7 @@
id = "hydro_tray"
build_path = /obj/item/circuitboard/machine/hydroponics
category = list ("Hydroponics Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/destructive_analyzer
name = "Machine Design (Destructive Analyzer Board)"
@@ -220,6 +232,7 @@
id = "protolathe"
build_path = /obj/item/circuitboard/machine/protolathe
category = list("Research Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/circuit_imprinter
name = "Machine Design (Circuit Imprinter Board)"
@@ -227,6 +240,7 @@
id = "circuit_imprinter"
build_path = /obj/item/circuitboard/machine/circuit_imprinter
category = list("Research Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/rdservercontrol
name = "Computer Design (R&D Server Control Console Board)"
@@ -274,6 +288,7 @@
id = "microwave"
build_path = /obj/item/circuitboard/machine/microwave
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/gibber
name = "Machine Design (Gibber Board)"
@@ -281,6 +296,7 @@
id = "gibber"
build_path = /obj/item/circuitboard/machine/gibber
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/smartfridge
name = "Machine Design (Smartfridge Board)"
@@ -288,6 +304,7 @@
id = "smartfridge"
build_path = /obj/item/circuitboard/machine/smartfridge
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/monkey_recycler
name = "Machine Design (Monkey Recycler Board)"
@@ -295,6 +312,7 @@
id = "monkey_recycler"
build_path = /obj/item/circuitboard/machine/monkey_recycler
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/seed_extractor
name = "Machine Design (Seed Extractor Board)"
@@ -302,6 +320,7 @@
id = "seed_extractor"
build_path = /obj/item/circuitboard/machine/seed_extractor
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/processor
name = "Machine Design (Food Processor Board)"
@@ -309,6 +328,7 @@
id = "processor"
build_path = /obj/item/circuitboard/machine/processor
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/slimeprocessor
name = "Machine Design (Slime Processor Board)"
@@ -316,6 +336,7 @@
id = "slimeprocessor"
build_path = /obj/item/circuitboard/machine/processor/slime
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/recycler
name = "Machine Design (Recycler Board)"
@@ -323,6 +344,7 @@
id = "recycler"
build_path = /obj/item/circuitboard/machine/recycler
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/holopad
name = "Machine Design (AI Holopad Board)"
@@ -338,6 +360,7 @@
id = "autolathe"
build_path = /obj/item/circuitboard/machine/autolathe
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL //Lets be honest here half the maps have public ones.
/datum/design/board/recharger
name = "Machine Design (Weapon Recharger Board)"
@@ -346,6 +369,7 @@
materials = list(MAT_GLASS = 1000, MAT_GOLD = 100)
build_path = /obj/item/circuitboard/machine/recharger
category = list("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/vendor
name = "Machine Design (Vendor Board)"
@@ -353,6 +377,7 @@
id = "vendor"
build_path = /obj/item/circuitboard/machine/vendor
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/ore_redemption
name = "Machine Design (Ore Redemption Board)"
@@ -360,7 +385,7 @@
id = "ore_redemption"
build_path = /obj/item/circuitboard/machine/ore_redemption
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/mining_equipment_vendor
name = "Machine Design (Mining Rewards Vender Board)"
@@ -368,7 +393,7 @@
id = "mining_equipment_vendor"
build_path = /obj/item/circuitboard/machine/mining_equipment_vendor
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
/datum/design/board/tesla_coil
name = "Machine Design (Tesla Coil Board)"
@@ -376,6 +401,7 @@
id = "tesla_coil"
build_path = /obj/item/circuitboard/machine/tesla_coil
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/grounding_rod
name = "Machine Design (Grounding Rod Board)"
@@ -383,6 +409,7 @@
id = "grounding_rod"
build_path = /obj/item/circuitboard/machine/grounding_rod
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/plantgenes
name = "Machine Design (Plant DNA Manipulator Board)"
@@ -390,6 +417,7 @@
id = "plantgenes"
build_path = /obj/item/circuitboard/machine/plantgenes
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/ntnet_relay
name = "Machine Design (NTNet Relay Board)"
@@ -397,7 +425,7 @@
id = "ntnet_relay"
build_path = /obj/item/circuitboard/machine/ntnet_relay
category = list("Subspace Telecomms")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/limbgrower
name = "Machine Design (Limb Grower Board)"
@@ -405,6 +433,7 @@
id = "limbgrower"
build_path = /obj/item/circuitboard/machine/limbgrower
category = list("Medical Machinery")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/board/deepfryer
name = "Machine Design (Deep Fryer)"
@@ -412,6 +441,7 @@
id = "deepfryer"
build_path = /obj/item/circuitboard/machine/deep_fryer
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/board/donksofttoyvendor
name = "Machine Design (Donksoft Toy Vendor Board)"
@@ -419,6 +449,7 @@
id = "donksofttoyvendor"
build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL //Toys!!
/datum/design/board/cell_charger
name = "Machine Design (Cell Charger Board)"
@@ -426,6 +457,7 @@
id = "cell_charger"
build_path = /obj/item/circuitboard/machine/cell_charger
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/dish_drive
name = "Machine Design (Dish Drive)"
@@ -433,3 +465,4 @@
id = "dish_drive"
build_path = /obj/item/circuitboard/machine/dish_drive
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
code/modules/research/designs/mining_designs.dm
+1 -1
View File
@@ -6,7 +6,7 @@
name = "Computer Design (Express Supply Console)"//shes beautiful
desc = "Allows for the construction of circuit boards used to build an Express Supply Console."//who?
id = "cargoexpress"//the coder reading this
build_type = PROTOLATHE
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/computer/cargo/express
category = list("Mining Designs")
code/modules/research/machinery/_production.dm
+4 -4
View File
@@ -41,7 +41,7 @@
cached_designs.Cut()
for(var/i in stored_research.researched_designs)
var/datum/design/d = stored_research.researched_designs[i]
if((d.departmental_flags & allowed_department_flags) && (d.build_type & allowed_buildtypes))
if((isnull(allowed_department_flags) || (d.departmental_flags & allowed_department_flags)) && (d.build_type & allowed_buildtypes))
cached_designs |= d
/obj/machinery/rnd/production/RefreshParts()
@@ -115,7 +115,7 @@
var/datum/design/D = (linked_console || requires_console)? linked_console.stored_research.researched_designs[id] : get_techweb_design_by_id(id)
if(!istype(D))
return FALSE
if(!(D.departmental_flags & allowed_department_flags))
if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
say("Warning: Printing failed: This fabricator does not have the necessary keys to decrypt design schematics. Please update the research data with the on-screen button and contact Nanotrasen Support!")
return FALSE
if(D.build_type && !(D.build_type & allowed_buildtypes))
@@ -152,7 +152,7 @@
matching_designs.Cut()
for(var/v in stored_research.researched_designs)
var/datum/design/D = stored_research.researched_designs[v]
if(!(D.build_type & allowed_buildtypes) || !(D.departmental_flags & allowed_department_flags))
if(!(D.build_type & allowed_buildtypes) || !(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
continue
if(findtext(D.name,string))
matching_designs.Add(D)
@@ -308,7 +308,7 @@
var/datum/design/D = stored_research.researched_designs[v]
if(!(selected_category in D.category)|| !(D.build_type & allowed_buildtypes))
continue
if(!(D.departmental_flags & allowed_department_flags))
if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
continue
l += design_menu_entry(D, coeff)
l += "</div>"
code/modules/research/machinery/circuit_imprinter.dm
+9 -1
View File
@@ -22,4 +22,12 @@
/obj/machinery/rnd/production/circuit_imprinter/disconnect_console()
linked_console.linked_imprinter = null
..()
..()
/obj/machinery/rnd/production/circuit_imprinter/calculate_efficiency()
. = ..()
var/total_rating = 0
for(var/obj/item/stock_parts/manipulator/M in component_parts)
total_rating += M.rating * 2 //There is only one.
total_rating = max(1, total_rating)
efficiency_coeff = total_rating
code/modules/research/rdconsole.dm
+8 -8
View File
@@ -280,7 +280,7 @@ doesn't have toxins access.
var/datum/design/D = stored_research.researched_designs[v]
if(!(selected_category in D.category)|| !(D.build_type & PROTOLATHE))
continue
if(!(D.departmental_flags & linked_lathe.allowed_department_flags))
if(!(isnull(linked_lathe.allowed_department_flags) || (D.departmental_flags & linked_lathe.allowed_department_flags)))
continue
var/temp_material
var/c = 50
@@ -291,9 +291,9 @@ doesn't have toxins access.
t = linked_lathe.check_mat(D, M)
temp_material += " | "
if (t < 1)
temp_material += "<span class='bad'>[all_materials[M]*coeff] [CallMaterialName(M)]</span>"
temp_material += "<span class='bad'>[all_materials[M]/coeff] [CallMaterialName(M)]</span>"
else
temp_material += " [all_materials[M]*coeff] [CallMaterialName(M)]"
temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
if (c >= 1)
@@ -332,7 +332,7 @@ doesn't have toxins access.
l += ui_protolathe_header()
var/coeff = linked_lathe.efficiency_coeff
for(var/datum/design/D in matching_designs)
if(!(D.departmental_flags & linked_lathe.allowed_department_flags))
if(!(isnull(linked_lathe.allowed_department_flags) || (D.departmental_flags & linked_lathe.allowed_department_flags)))
continue
var/temp_material
var/c = 50
@@ -342,9 +342,9 @@ doesn't have toxins access.
t = linked_lathe.check_mat(D, M)
temp_material += " | "
if (t < 1)
temp_material += "<span class='bad'>[all_materials[M]*coeff] [CallMaterialName(M)]</span>"
temp_material += "<span class='bad'>[all_materials[M]/coeff] [CallMaterialName(M)]</span>"
else
temp_material += " [all_materials[M]*coeff] [CallMaterialName(M)]"
temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
if (c >= 1)
@@ -422,7 +422,7 @@ doesn't have toxins access.
var/datum/design/D = stored_research.researched_designs[v]
if(!(selected_category in D.category) || !(D.build_type & IMPRINTER))
continue
if(!(D.departmental_flags & linked_imprinter.allowed_department_flags))
if(!(isnull(linked_imprinter.allowed_department_flags) || (D.departmental_flags & linked_imprinter.allowed_department_flags)))
continue
var/temp_materials
var/check_materials = TRUE
@@ -451,7 +451,7 @@ doesn't have toxins access.
var/coeff = linked_imprinter.efficiency_coeff
for(var/datum/design/D in matching_designs)
if(!(D.departmental_flags & linked_imprinter.allowed_department_flags))
if(!(isnull(linked_imprinter.allowed_department_flags) || (D.departmental_flags & linked_imprinter.allowed_department_flags)))
continue
var/temp_materials
var/check_materials = TRUE