From 494435be0eed924d03d0a9a678c0810d8100902e Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 21 Dec 2024 15:42:00 +0100 Subject: [PATCH 01/13] fixed engi lathe not being able to craft the RPD, added double O2 tank --- .../autolathe_designs_sec_and_hacked.dm | 4 ++-- code/modules/research/designs/misc_designs.dm | 10 ++++++++++ .../research/techweb/nodes/engineering_nodes.dm | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index bf9d5886a0..1c8bd86a31 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -58,9 +58,9 @@ build_path = /obj/item/construction/rcd category = list("hacked", "Construction") -/datum/design/rpd +/datum/design/rpd_autolathe name = "Rapid Pipe Dispenser (RPD)" - id = "rpd" + id = "rpd_autolathe" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 6f6a1fd88e..cf4a37fd9b 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -742,6 +742,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +/datum/design/double_emergency_oxygen_engi + name = "Double Engineering Emergency Oxygen Tank" + desc = "An double emergency oxygen tank for engineers." + id = "double_emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/silver = 200) + build_path = /obj/item/tank/internals/emergency_oxygen/double/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + ///////////////////////////////////////// /////////////////Tape//////////////////// ///////////////////////////////////////// diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 51b9480c27..7089af61b5 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -16,8 +16,8 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", - "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "rpd_autolathe", + "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) /datum/techweb_node/anomaly From 924e5c28bd15e5cbd10d18a8741203c069a2fa0b Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 21 Dec 2024 16:24:37 +0100 Subject: [PATCH 02/13] added beanbag chair recipes and deconstruction --- GainStation13/code/structures/chair.dm | 1 + code/game/objects/items/stacks/sheets/sheet_types.dm | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/GainStation13/code/structures/chair.dm b/GainStation13/code/structures/chair.dm index b139dffbbb..c9dfb731cd 100644 --- a/GainStation13/code/structures/chair.dm +++ b/GainStation13/code/structures/chair.dm @@ -63,6 +63,7 @@ icon_state = "beanbag" color = "#ffffff" anchored = FALSE + buildstacktype = /obj/item/stack/sheet/cloth buildstackamount = 5 item_chair = null diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8d96b2c88e..f9a250ed7d 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -412,6 +412,16 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteenXnineteen, 3), \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ + null, \ + // new/datum/stack_recipe("Beanbag chair", /obj/structure/chair/beanbag, 5), + new/datum/stack_recipe_list("beanbag chairs", list( \ + new/datum/stack_recipe("red beanbag chair", /obj/structure/chair/beanbag/red, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("blue beanbag chair", /obj/structure/chair/beanbag/blue, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("green beanbag chair",/obj/structure/chair/beanbag/green, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("purple beanbag chair", /obj/structure/chair/beanbag/purple, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("black beanbag chair", /obj/structure/chair/beanbag/black, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("GATO beanbag chair", /obj/structure/chair/beanbag/gato, 5, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ )) /obj/item/stack/sheet/cloth From 379100ddbe2e0f2015f6c52349d530161e00630f Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 21 Dec 2024 21:34:15 +0100 Subject: [PATCH 03/13] addeda comment, commit because git bullies me :( --- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index f9a250ed7d..041f02168e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ null, \ - // new/datum/stack_recipe("Beanbag chair", /obj/structure/chair/beanbag, 5), + // GS13 edit - beanbag chairs new/datum/stack_recipe_list("beanbag chairs", list( \ new/datum/stack_recipe("red beanbag chair", /obj/structure/chair/beanbag/red, 5, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("blue beanbag chair", /obj/structure/chair/beanbag/blue, 5, one_per_turf = TRUE, on_floor = TRUE), \ @@ -422,6 +422,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("black beanbag chair", /obj/structure/chair/beanbag/black, 5, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("GATO beanbag chair", /obj/structure/chair/beanbag/gato, 5, one_per_turf = TRUE, on_floor = TRUE), \ )), \ + // END GS13 edit )) /obj/item/stack/sheet/cloth From 9397bf71cac5ac494c1afcd6e0144b0231aa8cfd Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 01:22:18 +0100 Subject: [PATCH 04/13] beanbag chairs deconstructible with wirecutters, all other chairs deconstructible with wrench --- code/game/objects/structures/beds_chairs/chair.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 40613aa96b..8debdaa03f 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -77,7 +77,12 @@ qdel(src) /obj/structure/chair/attackby(obj/item/W, mob/user, params) - if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1)) + // GS13 EDIT - replaced wrench check with a check based on material and tool - chairs made from any material other + // than cloth will function the same as before, but chairs made from cloth will be destructible using a wirecutter + var/wrench_deconstruct = W.tool_behaviour == TOOL_WRENCH && buildstacktype != /obj/item/stack/sheet/cloth + var/wirecutter_deconstruct = W.tool_behaviour == TOOL_WIRECUTTER && buildstacktype == /obj/item/stack/sheet/cloth + if((wrench_deconstruct || wirecutter_deconstruct) && !(flags_1 & NODECONSTRUCT_1)) + // GS13 END EDIT W.play_tool_sound(src) deconstruct() else if(istype(W, /obj/item/assembly/shock_kit)) From 22165a20f1378ffba6ee246836c7e11e545fd538 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 09:56:08 +0100 Subject: [PATCH 05/13] changed node names to make it easier to look for them --- code/modules/research/designs/stock_parts_designs.dm | 4 ++-- code/modules/research/designs/tool_designs.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 7392f83975..ad3f070587 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -3,7 +3,7 @@ //////////////////////////////////////// /datum/design/RPED - name = "Rapid Part Exchange Device" + name = "Rapid Part Exchange Device (RPED)" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE @@ -13,7 +13,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/BS_RPED - name = "Bluespace RPED" + name = "Bluespace Rapid Part Exchange Device (RPED)" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" build_type = PROTOLATHE diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 5ef050efe9..b451e101f0 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,7 +33,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd - name = "Rapid Pipe Dispenser" + name = "Rapid Pipe Dispenser (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" build_type = PROTOLATHE From 30a68aa1b035968113296324201d1082b90ae669 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 12:46:27 +0100 Subject: [PATCH 06/13] advanced engineering research node no longershows 2 rpd's --- code/modules/research/designs/tool_designs.dm | 2 +- code/modules/research/techweb/nodes/engineering_nodes.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index b451e101f0..e83e50f431 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,7 +33,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd - name = "Rapid Pipe Dispenser (RPD)" + name = "Rapid Piping Device (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" build_type = PROTOLATHE diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 7089af61b5..a9864ac50c 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -16,7 +16,7 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "rpd_autolathe", + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) From 3bd4b1a4575ff0c2c9332a18aba49e168aad4f94 Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:04 -0500 Subject: [PATCH 07/13] Update code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index 1c8bd86a31..f1afd7d9d5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -58,7 +58,7 @@ build_path = /obj/item/construction/rcd category = list("hacked", "Construction") -/datum/design/rpd_autolathe +/datum/design/rpd_autolathe //ORIGINAL /datum/design/rpd name = "Rapid Pipe Dispenser (RPD)" id = "rpd_autolathe" build_type = AUTOLATHE | NO_PUBLIC_LATHE From 7af1c41411e82ec656e5b5e727a5b84096180040 Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:14 -0500 Subject: [PATCH 08/13] Update code/modules/research/designs/misc_designs.dm --- code/modules/research/designs/misc_designs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index cf4a37fd9b..e5efcdc6e1 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -742,6 +742,7 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT START /datum/design/double_emergency_oxygen_engi name = "Double Engineering Emergency Oxygen Tank" desc = "An double emergency oxygen tank for engineers." @@ -751,6 +752,7 @@ build_path = /obj/item/tank/internals/emergency_oxygen/double/empty category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT END ///////////////////////////////////////// /////////////////Tape//////////////////// From f77aaba85833168942db8a7e182b82bdce6dbb3d Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:21 -0500 Subject: [PATCH 09/13] Update code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index f1afd7d9d5..6fd1cd2ef5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -60,7 +60,7 @@ /datum/design/rpd_autolathe //ORIGINAL /datum/design/rpd name = "Rapid Pipe Dispenser (RPD)" - id = "rpd_autolathe" + id = "rpd_autolathe" // ORIGINAL id = "rpd" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser From c08690cd6d1d2a8a050d028ae2d4ab002e17d03f Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:29 -0500 Subject: [PATCH 10/13] Update code/modules/research/designs/stock_parts_designs.dm --- code/modules/research/designs/stock_parts_designs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index ad3f070587..889e5b7c7d 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -3,6 +3,7 @@ //////////////////////////////////////// /datum/design/RPED + // ORIGINAL name = "Rapid Part Exchange Device" name = "Rapid Part Exchange Device (RPED)" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" From d56b15f7fa0c36e465bd8da1f65820e0f0d837fe Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:38 -0500 Subject: [PATCH 11/13] Update code/modules/research/designs/stock_parts_designs.dm --- code/modules/research/designs/stock_parts_designs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 889e5b7c7d..e4934a1f85 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -14,6 +14,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/BS_RPED + // ORIGINAL name = "Bluespace RPED" name = "Bluespace Rapid Part Exchange Device (RPED)" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" From b6964b6f9225e5cfb06be36efa9da02edcaef1da Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:45 -0500 Subject: [PATCH 12/13] Update code/modules/research/designs/tool_designs.dm --- code/modules/research/designs/tool_designs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index e83e50f431..7ed2969926 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,6 +33,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd + // ORIGINAL name = "Rapid Pipe Dispenser" name = "Rapid Piping Device (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" From 4e87d46f890f82da32e7dcca7c4c16a0af62451d Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:51 -0500 Subject: [PATCH 13/13] Update code/modules/research/techweb/nodes/engineering_nodes.dm --- code/modules/research/techweb/nodes/engineering_nodes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index a9864ac50c..15feb89149 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -17,6 +17,7 @@ description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", + // ORIGINAL "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)