From 0408dbaed182845d0e0904b6f3b1fc64bb2fece1 Mon Sep 17 00:00:00 2001 From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue, 16 Jul 2024 13:08:12 -0600 Subject: [PATCH] techweb fixes (#1802) ## About The Pull Request Synth shells and borg pinpointers are now printable. We need to align our techweb more with the upstream changes, but it is what it is for now. ## Why It's Good For The Game Fixes some of our techweb ## Proof Of Testing ![image](https://github.com/user-attachments/assets/17664865-cc2b-4d37-af47-341abb975a52) ## Changelog :cl: fix: Borg Pinpointers and synthshells are now printable once more. /:cl: --- .../synths/code/designs/exofab_designs.dm | 19 ------------------- .../research/designs/mechfab_designs.dm | 15 +++++++++++++++ .../modules/research/techweb/all_nodes.dm | 8 ++++++++ tgstation.dme | 1 - 4 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm diff --git a/modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm b/modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm deleted file mode 100644 index 620a0938a96..00000000000 --- a/modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm +++ /dev/null @@ -1,19 +0,0 @@ -/datum/techweb_node/base/New() - . = ..() - design_ids += list( - "blanksynth", - "dominatrixmodule", - ) - -/datum/design/synthclone - name = "Blank synthetic shell" - id = "blanksynth" - build_type = MECHFAB - construction_time = 60 SECONDS - materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 20, - /datum/material/glass = SHEET_MATERIAL_AMOUNT * 10, - /datum/material/silver = SHEET_MATERIAL_AMOUNT * 0.5, - /datum/material/gold = SHEET_MATERIAL_AMOUNT * 0.25) - category = list(RND_CATEGORY_MECHFAB_SYNTH + RND_SUBCATEGORY_MECHFAB_SYNTH_PARTS) - - build_path = /mob/living/carbon/human/species/synth/empty diff --git a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm index 8b652e4f87e..7749b30d343 100644 --- a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm +++ b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm @@ -1,3 +1,18 @@ +// Empty shell + +/datum/design/synthclone + name = "Blank synthetic shell" + id = "blanksynth" + build_type = MECHFAB + construction_time = 60 SECONDS + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 20, + /datum/material/glass = SHEET_MATERIAL_AMOUNT * 10, + /datum/material/silver = SHEET_MATERIAL_AMOUNT * 0.5, + /datum/material/gold = SHEET_MATERIAL_AMOUNT * 0.25) + category = list(RND_CATEGORY_MECHFAB_SYNTH + RND_SUBCATEGORY_MECHFAB_SYNTH_PARTS) + + build_path = /mob/living/carbon/human/species/synth/empty + /datum/design/borg_upgrade_advcutter name = "Advanced Plasma Cutter" id = "borg_upgrade_advcutter" diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm index 044507ea936..3d05709d27d 100644 --- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm +++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm @@ -61,9 +61,17 @@ /datum/techweb_node/borg_medical/New() design_ids += list( "borg_upgrade_surgicalprocessor_sci", + "borg_upgrade_pinpointer", ) return ..() +/datum/techweb_node/augmentation/New() + . = ..() + design_ids += list( + "blanksynth", + "dominatrixmodule", + ) + // Computer Tech /datum/techweb_node/gaming/New() . = ..() diff --git a/tgstation.dme b/tgstation.dme index 7973b69f116..ef031f7ff8f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8792,7 +8792,6 @@ #include "modular_zubbers\code\modules\customization\height_scaling\preferences.dm" #include "modular_zubbers\code\modules\customization\species\synths\death_sound.dm" #include "modular_zubbers\code\modules\customization\species\synths\code\synth_prefab.dm" -#include "modular_zubbers\code\modules\customization\species\synths\code\designs\exofab_designs.dm" #include "modular_zubbers\code\modules\customization\sprite_accessories\64_wings.dm" #include "modular_zubbers\code\modules\customization\sprite_accessories\ears.dm" #include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm"