From 2b722e6d0be6af01c0ac18d638d11d3f00ae1aec Mon Sep 17 00:00:00 2001 From: Flint Date: Sun, 12 Jan 2020 21:34:43 -0600 Subject: [PATCH 01/11] Adds droppers to medical protolathes and autolathes See title --- code/modules/research/designs/autolathe_designs.dm | 9 +++++++++ code/modules/research/techweb/all_nodes.dm | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index f64e94aedee..9b66e634fc3 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -694,6 +694,15 @@ category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/dropper + name = "Dropper" + id = "dropper" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/glass = 40) + build_path = /obj/item/reagent_containers/dropper + category = list("initial", "Medical", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + /datum/design/prox_sensor name = "Proximity Sensor" id = "prox_sensor" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e0491e6fad5..64b745201be 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -48,7 +48,7 @@ starting_node = TRUE display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." - design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "surgical_drapes", "syringe", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "plunger") + design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "surgical_drapes", "syringe", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "plunger", "dropper") /////////////////////////Biotech///////////////////////// /datum/techweb_node/biotech From 87a1c4b2865b13f797f821158a983b943820380e Mon Sep 17 00:00:00 2001 From: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Date: Mon, 13 Jan 2020 12:42:17 -0600 Subject: [PATCH 02/11] Makes stuff plastic and good --- code/modules/research/designs/autolathe_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 9b66e634fc3..776722ee515 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -536,7 +536,7 @@ name = "Pill Bottle" id = "pillbottle" build_type = AUTOLATHE - materials = list(/datum/material/iron = 20, /datum/material/glass = 100) + materials = list(/datum/material/plastic = 20, /datum/material/glass = 100) build_path = /obj/item/storage/pill_bottle category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL @@ -698,7 +698,7 @@ name = "Dropper" id = "dropper" build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/glass = 40) + materials = list(/datum/material/glass = 10, /datum/material/plastic = 30) build_path = /obj/item/reagent_containers/dropper category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL From ca535d9714aebfcfb1d18b1c8a1faf9ffb1ce87e Mon Sep 17 00:00:00 2001 From: TheVekter Date: Sun, 12 Jan 2020 20:16:30 -0600 Subject: [PATCH 03/11] Fixes Genetics access on Box and Pubby (#48713) * Moves Geneticist to a purely Science job * lmao map conflicts * [Ready] Adds a new RnD method, the B.E.P.I.S. (#48040) * Squashes Commits, has BEPIS, Techs, TGUIs, Rewards, and fixes. * Makes rewardable techs a variable in all_nodes, and removes RnD Points rewards from the minor reward pool. * Fixes conflict with pubby and beam icon. * Review comments and basic cleanup A * Review Comments and basic cleanup B, also cleans up icon states to work fluidly. * Map Update * Indentation, flipped Update_decal_path, and rebuilds tgui * One last clean up of icon_state, adds the last bit of changes from review, and that should be everything. * Alright last change for real I swear 105% * Last change, adds simple sanity check for silicons. * Moved Human and card variables into ui_interact. * Fixes map conflict * Alright Review Round 2 Part A, Fixes Grammar, splits polycircuit into it's own file, UI QOL improvements, Withdrawing credits, changes from arbitary values on the mini RLD, etc. * More review bits, Part 2:B. Easier returns for less processing, Defines, fixes the merge conflict and updates the UI with new buttons. Just need to figure out Button Mapping for the UI and Duplicate prevention. * Implemented duplicate tech protection. Yeet. * Get back in there you * Alright why are you breaking on me god damnit. * It's optimized, closer to god, nearly perfect, all together it's ready to ship. * Cleans up all of the decal painter, shorter, cleaner, works around all the turf_decal quirks. * Tab spacing on github will look fucky * More review changes. * Uses use_power == ACTIVE_POWER_USE instead of powered except for the UI * Fixes access issues on Box and PubbyStation Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> --- _maps/map_files/BoxStation/BoxStation.dmm | 3 +-- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 426ea8b6a03..93df6599a9e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -52418,9 +52418,8 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - abandoned = "47, 9"; name = "Genetics Lab"; - req_access_txt = "47" + req_access_txt = "9" }, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e2220a49e3c..31085410f19 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -27981,7 +27981,7 @@ }, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "55" + req_one_access_txt = "55, 9" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, From 758e9e31a9f4aab3c0d95166acb15b929ce61afa Mon Sep 17 00:00:00 2001 From: TheVekter Date: Sun, 12 Jan 2020 20:16:30 -0600 Subject: [PATCH 04/11] Revert "Fixes Genetics access on Box and Pubby (#48713)" This reverts commit 9bd3d75eb59da263323e0f4b01b607004aa36eca. --- _maps/map_files/BoxStation/BoxStation.dmm | 3 ++- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 93df6599a9e..426ea8b6a03 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -52418,8 +52418,9 @@ dir = 4 }, /obj/machinery/door/airlock/research{ + abandoned = "47, 9"; name = "Genetics Lab"; - req_access_txt = "9" + req_access_txt = "47" }, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 31085410f19..e2220a49e3c 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -27981,7 +27981,7 @@ }, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_one_access_txt = "55, 9" + req_access_txt = "55" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, From 583b4aebf51ba3e14435ae81748ec4b9dae18029 Mon Sep 17 00:00:00 2001 From: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Date: Mon, 13 Jan 2020 12:42:17 -0600 Subject: [PATCH 05/11] Makes stuff plastic and good --- code/modules/research/designs/autolathe_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 9b66e634fc3..776722ee515 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -536,7 +536,7 @@ name = "Pill Bottle" id = "pillbottle" build_type = AUTOLATHE - materials = list(/datum/material/iron = 20, /datum/material/glass = 100) + materials = list(/datum/material/plastic = 20, /datum/material/glass = 100) build_path = /obj/item/storage/pill_bottle category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL @@ -698,7 +698,7 @@ name = "Dropper" id = "dropper" build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/glass = 40) + materials = list(/datum/material/glass = 10, /datum/material/plastic = 30) build_path = /obj/item/reagent_containers/dropper category = list("initial", "Medical", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL From 4bb0e06116202042e772d6893af4e60a74d77c19 Mon Sep 17 00:00:00 2001 From: Flint Date: Sat, 18 Jan 2020 22:16:51 -0600 Subject: [PATCH 06/11] DUCKS WORK! --- code/game/objects/structures/watercloset.dm | 3 +++ code/modules/research/designs/misc_designs.dm | 14 ++++++++++++-- code/modules/research/techweb/all_nodes.dm | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 69cc2b182e6..5bd94144645 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -235,6 +235,9 @@ icon_state = "rubberducky" item_state = "rubberducky" +/obj/item/bikehorn/rubberducky/plasticducky + name = "plastic ducky" + desc = "It appears to be a cheap plastic knockoff of a loveable bathtime toy." /obj/structure/sink name = "sink" diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 09fd097d37e..2f218b9cbe4 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -275,7 +275,7 @@ build_path = /obj/item/tank/internals/plasma/empty category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE - + /datum/design/id name = "Identification Card" desc = "A card used to provide ID and determine access across the station." @@ -284,7 +284,17 @@ materials = list(/datum/material/iron=200, /datum/material/glass = 100) build_path = /obj/item/card/id category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + +/datum/design/plasticducky + name = "Rubber Ducky" + desc = "The classic Nanotracen design for competitively priced bath based duck toys. No need for fancy Waffle co. rubber, buy Plastic Ducks today!" + id = "plasticducky" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 1000) + build_path = /obj/item/bikehorn/rubberducky/plasticducky + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ALL ///////////////////////////////////////// ////////////Janitor Designs////////////// diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e0491e6fad5..c2d39d07994 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -385,7 +385,7 @@ display_name = "Clown Technology" description = "Honk?!" prereq_ids = list("base") - design_ids = list("air_horn", "honker_main", "honker_peri", "honker_targ", "honk_chassis", "honk_head", "honk_torso", "honk_left_arm", "honk_right_arm", + design_ids = list("air_horn", "plasticducky", "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) export_price = 5000 From 33ebbc97a3a079362a123fc766c907364a6d0082 Mon Sep 17 00:00:00 2001 From: Flint Date: Sat, 18 Jan 2020 22:28:19 -0600 Subject: [PATCH 07/11] Desc fix --- code/game/objects/structures/watercloset.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 5bd94144645..5da67143ba6 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -237,7 +237,7 @@ /obj/item/bikehorn/rubberducky/plasticducky name = "plastic ducky" - desc = "It appears to be a cheap plastic knockoff of a loveable bathtime toy." + desc = "It's a cheap plastic knockoff of a loveable bathtime toy." /obj/structure/sink name = "sink" From f470bff6028c21c6d9425aed5ed77a79dd1cd621 Mon Sep 17 00:00:00 2001 From: Flint Date: Sun, 19 Jan 2020 19:37:19 -0600 Subject: [PATCH 08/11] Part 1 --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 64b745201be..e0491e6fad5 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -48,7 +48,7 @@ starting_node = TRUE display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." - design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "surgical_drapes", "syringe", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "plunger", "dropper") + design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "surgical_drapes", "syringe", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "plunger") /////////////////////////Biotech///////////////////////// /datum/techweb_node/biotech From 1249f64b9242118cf8ee21eeaf3a4ba2495c454c Mon Sep 17 00:00:00 2001 From: Flint Date: Sun, 19 Jan 2020 19:48:03 -0600 Subject: [PATCH 09/11] Part 2 --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index f02c8c98429..b5f2cde8277 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -57,7 +57,7 @@ display_name = "Basic Medical Equipment" description = "Basic medical tools and equipment." design_ids = list("cybernetic_liver", "cybernetic_heart", "cybernetic_lungs", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", - "surgical_drapes", "syringe", "plumbing_rcd", "beaker", "large_beaker", "xlarge_beaker") + "surgical_drapes", "syringe", "plumbing_rcd", "beaker", "large_beaker", "xlarge_beaker", "dropper") /////////////////////////Biotech///////////////////////// /datum/techweb_node/biotech From 738e970ad196dd2916e0137733a48d439bbe5343 Mon Sep 17 00:00:00 2001 From: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Date: Sun, 19 Jan 2020 20:06:49 -0600 Subject: [PATCH 10/11] Ducks --- code/game/objects/structures/watercloset.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 5da67143ba6..2ff1388e22d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -235,10 +235,6 @@ icon_state = "rubberducky" item_state = "rubberducky" -/obj/item/bikehorn/rubberducky/plasticducky - name = "plastic ducky" - desc = "It's a cheap plastic knockoff of a loveable bathtime toy." - /obj/structure/sink name = "sink" icon = 'icons/obj/watercloset.dmi' From 7475a783ff86ae25936577df9f2ec4ef73f7ecff Mon Sep 17 00:00:00 2001 From: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Date: Sun, 19 Jan 2020 20:08:13 -0600 Subject: [PATCH 11/11] Duck 2 boogalo --- code/modules/research/techweb/all_nodes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index b5f2cde8277..787dd76dbd9 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -394,7 +394,7 @@ display_name = "Clown Technology" description = "Honk?!" prereq_ids = list("base") - design_ids = list("air_horn", "plasticducky", "honker_main", "honker_peri", "honker_targ", "honk_chassis", "honk_head", "honk_torso", "honk_left_arm", "honk_right_arm", + 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) export_price = 5000