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

Conflicts!!!

Browse Source
This commit is contained in:
Artur
2020-06-22 17:39:24 +03:00
parent 66cbdd1174 a0a4007332
commit c41d2e78be
395 changed files with 84463 additions and 336540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autobotter_designs.dm
+1
View File
@@ -165,6 +165,7 @@
name = "Export Design (Gin)"
desc = "Allows for the blowing, and bottling of Gin bottles."
id = "gin_export"
reagents_list = list(/datum/reagent/consumable/ethanol/gin = 50)
build_path = /obj/item/export/bottle/gin
/datum/design/bottle/export/whiskey
code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
+17 -1
View File
@@ -43,4 +43,20 @@
id = "libraryconsole"
build_path = /obj/item/circuitboard/computer/libraryconsole
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
departmental_flags = DEPARTMENTAL_FLAG_ALL
/datum/design/board/flight_control
name = "Computer Design (Shuttle Flight Controls)"
desc = "Allows for the construction of circuit boards used to build a console that enables shuttle flight"
id = "shuttle_control"
build_path = /obj/item/circuitboard/computer/shuttle/flight_control
category = list("Computer Boards", "Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/board/shuttle_docker
name = "Computer Design (Private Navigation Computer)"
desc = "Allows for the construction of circuit boards used to build a console that enables the targetting of custom flight locations"
id = "shuttle_docker"
build_path = /obj/item/circuitboard/computer/shuttle/docker
category = list("Computer Boards", "Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm
+8
View File
@@ -10,6 +10,14 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/shuttleseccamera
name = "Computer Design (Shuttle-Linked Security Camera)"
desc = "Same as a regular security camera console, but when linked to a shuttle, will specifically access cameras on that shuttle."
id = "shuttleseccamera"
build_path = /obj/item/circuitboard/computer/security/shuttle
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/secdata
name = "Computer Design (Security Records Console)"
desc = "Allows for the construction of circuit boards used to build a security records console."
code/modules/research/designs/electronics_designs.dm
-2
View File
@@ -166,5 +166,3 @@
desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
id = "xenobio_slimeadv"
build_path = /obj/item/disk/xenobio_console_upgrade/slimeadv
code/modules/research/designs/machine_desings/machine_designs_all_misc.dm
+24
View File
@@ -130,3 +130,27 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
build_path = /obj/item/circuitboard/machine/hypnochair
category = list("Misc. Machinery")
/datum/design/board/engine_plasma
name = "Machine Design (Plasma Thruster Board)"
desc = "The circuit board for a plasma thruster."
id = "engine_plasma"
build_path = /obj/item/circuitboard/machine/shuttle/engine/plasma
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/engine_void
name = "Machine Design (Void Thruster Board)"
desc = "The circuit board for a void thruster."
id = "engine_void"
build_path = /obj/item/circuitboard/machine/shuttle/engine/void
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/engine_heater
name = "Machine Design (Engine Heater Board)"
desc = "The circuit board for an engine heater."
id = "engine_heater"
build_path = /obj/item/circuitboard/machine/shuttle/heater
category = list ("Shuttle Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
code/modules/research/designs/medical_designs.dm
+10
View File
@@ -212,6 +212,16 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/chem_pack
name = "Intravenous Medicine Bag"
desc = "A plastic pressure bag for IV administration of drugs."
id = "chem_pack"
build_type = PROTOLATHE
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
materials = list(/datum/material/plastic = 1500)
build_path = /obj/item/reagent_containers/chem_pack
category = list("Medical Designs")
/datum/design/cloning_disk
name = "Cloning Data Disk"
desc = "Produce additional disks for storing genetic data."
code/modules/research/designs/misc_designs.dm
+66 -1
View File
@@ -760,4 +760,69 @@
materials = list(/datum/material/iron = 1000)
build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/////////////////////////////////////////
/////////////////Tape////////////////////
/////////////////////////////////////////
/datum/design/sticky_tape
name = "Sticky Tape"
id = "sticky_tape"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = 500)
build_path = /obj/item/stack/sticky_tape
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/super_sticky_tape
name = "Super Sticky Tape"
id = "super_sticky_tape"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = 3000)
build_path = /obj/item/stack/sticky_tape/super
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/pointy_tape
name = "Pointy Tape"
id = "pointy_tape"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 1500, /datum/material/plastic = 1000)
build_path = /obj/item/stack/sticky_tape/pointy
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/////////////////////////////////////////
/////////////////Shuttle Upgrades////////
/////////////////////////////////////////
/datum/design/shuttle_speed_upgrade
name = "Shuttle Route Optimisation Upgrade"
desc = "A disk that allows for calculating shorter routes when inserted into a flight control console."
id = "disk_shuttle_route"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000)
build_path = /obj/item/shuttle_route_optimisation
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/shuttle_speed_upgrade_hyper
name = "Shuttle Bluespace Hyperlane Optimisation Upgrade"
desc = "A disk that allows for calculating shorter routes when inserted into a flight control console. This one abuses bluespace hyperlanes for increased efficiency."
id = "disk_shuttle_route_hyper"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000)
build_path = /obj/item/shuttle_route_optimisation/hyperlane
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/shuttle_speed_upgrade_void
name = "Shuttle Voidspace Optimisation Upgrade"
desc = "A disk that allows for calculating shorter routes when inserted into a flight control console. This one access voidspace for increased efficiency."
id = "disk_shuttle_route_void"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000)
build_path = /obj/item/shuttle_route_optimisation/void
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
code/modules/research/designs/tool_designs.dm
+10
View File
@@ -42,6 +42,16 @@
category = list("Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/shuttlecreator
name = "Rapid Shuttle Designator"
desc = "An advanced device capable of defining areas for use in the creation of shuttles"
id = "shuttle_creator"
build_path = /obj/item/shuttle_creator
build_type = PROTOLATHE
materials = list(/datum/material/iron = 8000, /datum/material/titanium = 5000, /datum/material/bluespace = 5000)
category = list("Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
/datum/design/handdrill
name = "Hand Drill"
desc = "A small electric hand drill with an interchangeable screwdriver and bolt bit"
code/modules/research/techweb/nodes/bepis_nodes.dm
+9
View File
@@ -80,3 +80,12 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
hidden = TRUE
experimental = TRUE
/datum/techweb_node/sticky_advanced
id = "sticky_advanced"
display_name = "Advanced Sticky Technology"
description = "Taking a good joke too far? Nonsense!"
design_ids = list("super_sticky_tape", "pointy_tape")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
hidden = TRUE
experimental = TRUE
code/modules/research/techweb/nodes/biotech_nodes.dm
+1 -1
View File
@@ -5,7 +5,7 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner")
design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/adv_biotech
code/modules/research/techweb/nodes/bluespace_nodes.dm
+33
View File
@@ -63,3 +63,36 @@
prereq_ids = list("bluespace_warping", "syndicate_basic")
design_ids = list("desynchronizer")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/////////////////////////shuttle tech/////////////////////////
/datum/techweb_node/basic_shuttle_tech
id = "basic_shuttle"
display_name = "Basic Shuttle Research"
description = "Research the technology required to create and use basic shuttles."
prereq_ids = list("practical_bluespace", "adv_engi")
design_ids = list("shuttle_creator", "engine_plasma", "engine_heater", "shuttle_control", "shuttle_docker")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
/datum/techweb_node/shuttle_route_upgrade
id = "shuttle_route_upgrade"
display_name = "Route Optimisation Upgrade"
description = "Research into bluespace tunnelling, allowing us to reduce flight times by up to 20%!"
prereq_ids = list("basic_shuttle")
design_ids = list("disk_shuttle_route")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/shuttle_route_upgrade_hyper
id = "shuttle_route_upgrade_hyper"
display_name = "Hyperlane Optimisation Upgrade"
description = "Research into bluespace hyperlane, allowing us to reduce flight times by up to 40%!"
prereq_ids = list("shuttle_route_upgrade", "bluespace_warping")
design_ids = list("disk_shuttle_route_hyper")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
/datum/techweb_node/shuttle_route_upgrade_void
id = "shuttle_route_upgrade_void"
display_name = "Nullspace Breaching Upgrade"
description = "Research into voidspace tunnelling, allowing us to significantly reduce flight times."
prereq_ids = list("shuttle_route_upgrade_hyper", "alientech")
design_ids = list("disk_shuttle_route_void", "engine_void")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 12500)
code/modules/research/techweb/nodes/misc_nodes.dm
+21
View File
@@ -66,3 +66,24 @@
design_ids = list("air_horn", "honker_main", "honker_peri", "honker_targ", "honk_chassis", "honk_head", "honk_torso", "honk_left_arm", "honk_right_arm",
"honk_left_leg", "honk_right_leg", "mech_banana_mortar", "mech_mousetrap_mortar", "mech_honker", "mech_punching_face", "implant_trombone", "borg_transform_clown")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
////////////////////////Tape tech////////////////////////////
/datum/techweb_node/sticky_basic
id = "sticky_basic"
display_name = "Basic Sticky Technology"
description = "The only thing left to do after researching this tech is to start printing out a bunch of 'kick me' signs."
prereq_ids = list("base")
design_ids = list("sticky_tape")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
hidden = TRUE
experimental = TRUE
// Can be researched after getting the basic sticky technology from the BEPIS major reward
/datum/techweb_node/sticky_advanced
id = "sticky_advanced"
display_name = "Advanced Sticky Technology"
description = "Taking a good joke too far? Nonsense!"
prereq_ids = list("sticky_basic")
design_ids = list("super_sticky_tape", "pointy_tape")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
hidden = TRUE