From 332cca2deac6efd81edd58ec6d5b26f0626f098d Mon Sep 17 00:00:00 2001 From: LT3 <83487515+lessthnthree@users.noreply.github.com> Date: Sun, 9 Aug 2026 12:14:04 -0700 Subject: [PATCH] limb grower shadekin limbs, design enhancements (#5967) ## About The Pull Request - [x] Adds shadekin eyes and ears to the limb grower. - [x] Makes the various species parts available upon research without having to print 8 different design disks - [x] Adjust pricing of some bodyparts to be similar to base human parts - [x] Adds adaptable lungs as researchable expansion for limb grower ## Why It's Good For The Game Quality of life. Having to print the design disks alongside the limb grower is pointless, it costs next to nothing materials wise and takes a bunch of inventory space to do it. ## Changelog :cl: LT3 add: Added shadekin eyes and ears to limb grower qol: Limb grower automatically includes species parts, no more species disks required add: Adaptive hot/oxy/tox lungs can now be printed from the limb grower once researched /:cl: --------- Co-authored-by: Alexis --- .../bubberstation/icemoon_interdyne.dmm | 12 - code/__DEFINES/~~bubber_defines/quirks.dm | 1 + .../research/designs/limbgrower_designs.dm | 7 +- .../research/techweb/nodes/biology_nodes.dm | 2 + .../code/game/machinery/limbgrower.dm | 19 +- .../modules/implants/code/medical_nodes.dm | 40 --- .../medical_designs/medical_designs.dm | 19 -- .../modules/designs/limbgrower_designs.dm | 314 +++++++++++++----- .../limbgrowncorpses/limbgrowerblanks.dm | 25 -- .../modules/research/techweb/all_nodes.dm | 54 ++- tgstation.dme | 3 +- 11 files changed, 295 insertions(+), 201 deletions(-) create mode 100644 code/__DEFINES/~~bubber_defines/quirks.dm delete mode 100644 modular_skyrat/modules/implants/code/medical_nodes.dm delete mode 100644 modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm index 44fcc284f54..125e66a9a92 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm @@ -2165,18 +2165,6 @@ /turf/open/floor/wood, /area/ruin/syndicate_lava_base/testlab) "pN" = ( -/obj/item/disk/design_disk/limbs/ethereal{ - pixel_y = 2 - }, -/obj/item/disk/design_disk/limbs/felinid{ - pixel_y = 4 - }, -/obj/item/disk/design_disk/limbs/lizard{ - pixel_y = 6 - }, -/obj/item/disk/design_disk/limbs/plasmaman{ - pixel_y = 8 - }, /obj/structure/table/reinforced, /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/blue{ diff --git a/code/__DEFINES/~~bubber_defines/quirks.dm b/code/__DEFINES/~~bubber_defines/quirks.dm new file mode 100644 index 00000000000..38d534c1ed1 --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/quirks.dm @@ -0,0 +1 @@ +#define HEMOPHAGE "hemophage" diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index 7a04c27016a..e9e00f90ae6 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -244,12 +244,13 @@ category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = NONE // BUBBER EDIT CHANGE - ORIGINAL: DEPARTMENT_BITFLAG_MEDICAL /obj/item/disk/design_disk/limbs/felinid name = "Felinid Organ Design Disk" limb_designs = list(/datum/design/cat_tail, /datum/design/cat_ears, /datum/design/cat_tongue) - +// BUBBER EDIT REMOVE BEGIN - LIMB GROWERS INCLUDE ALL LIMB TYPES +/* /datum/design/limb_disk/felinid name = "Felinid Organ Design Disk" desc = "Contains designs for felinid organs for the limbgrower - Felinid ears, tail and tongue." @@ -285,3 +286,5 @@ desc = "Contains designs for ethereal organs for the limbgrower - Ethereal tongue and stomach." id = "limbdesign_ethereal" build_path = /obj/item/disk/design_disk/limbs/ethereal +*/ +// BUBBER EDIT REMOVE END - LIMB GROWERS INCLUDE ALL LIMB TYPES diff --git a/code/modules/research/techweb/nodes/biology_nodes.dm b/code/modules/research/techweb/nodes/biology_nodes.dm index ff100cd0d78..80e39789dc9 100644 --- a/code/modules/research/techweb/nodes/biology_nodes.dm +++ b/code/modules/research/techweb/nodes/biology_nodes.dm @@ -39,10 +39,12 @@ design_ids = list( "xenobioconsole", "slime_scanner", + /* BUBBER EDIT REMOVE - LIMB GROWERS INCLUDE ALL LIMB TYPES "limbdesign_ethereal", "limbdesign_felinid", "limbdesign_lizard", "limbdesign_plasmaman", + */ ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) discount_experiments = list(/datum/experiment/scanning/cytology/slime = TECHWEB_TIER_3_POINTS) diff --git a/modular_skyrat/master_files/code/game/machinery/limbgrower.dm b/modular_skyrat/master_files/code/game/machinery/limbgrower.dm index edf0474bfa0..cb3491a9f10 100644 --- a/modular_skyrat/master_files/code/game/machinery/limbgrower.dm +++ b/modular_skyrat/master_files/code/game/machinery/limbgrower.dm @@ -1,3 +1,20 @@ /obj/machinery/limbgrower/Initialize(mapload) - categories += list(SPECIES_SNAIL) + categories += list( + SPECIES_FELINE, + HEMOPHAGE, + SPECIES_TAJARAN, + SPECIES_TESHARI, + SPECIES_SHADEKIN, + SPECIES_SNAIL + ) return ..() + +// Used for printing dead bodies with the limbgrower +/mob/living/carbon/human/empty + +/mob/living/carbon/human/empty/Initialize(mapload) + . = ..() + death() + + var/obj/item/organ/brain/to_remove = get_organ_slot(ORGAN_SLOT_BRAIN) + QDEL_NULL(to_remove) diff --git a/modular_skyrat/modules/implants/code/medical_nodes.dm b/modular_skyrat/modules/implants/code/medical_nodes.dm deleted file mode 100644 index 9a1fe365316..00000000000 --- a/modular_skyrat/modules/implants/code/medical_nodes.dm +++ /dev/null @@ -1,40 +0,0 @@ -/datum/techweb_node/cyber/cyber_implants/New() - design_ids += list( - "ci-scanner", - "ci-gloweyes", - "ci-welding", - "ci-medhud", - "ci-sechud", - "ci-diaghud", - "ci-civhud", - "ci-botany", - "ci-janitor", - "ci-lighter", - "ci-razor", - ) - return ..() - -/datum/techweb_node/cyber/cyber_organs_upgraded/New() - design_ids -= list( - "ci-gloweyes", - "ci-welding", - ) - return ..() - -/datum/techweb_node/cyber/combat_implants/New() - design_ids += list( - "ci-mantis", - "ci-flash", - "ci-antisleep", - ) - return ..() - -/datum/techweb_node/cyber/night_vision_implants - id = TECHWEB_NODE_NIGHT_VISION_IMPLANTS - display_name = "Night vision implants" - description = "Now you can work all night, even if you lost your glasses!" - prereq_ids = list(TECHWEB_NODE_NIGHT_VISION, TECHWEB_NODE_CYBER_IMPLANTS) - design_ids = list( - "ci-nv", - ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) diff --git a/modular_skyrat/modules/medical_designs/medical_designs.dm b/modular_skyrat/modules/medical_designs/medical_designs.dm index 45b4e2622ef..7ae0549fe38 100644 --- a/modular_skyrat/modules/medical_designs/medical_designs.dm +++ b/modular_skyrat/modules/medical_designs/medical_designs.dm @@ -10,22 +10,3 @@ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL, ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE - -//Limb Grower -/datum/design/nitrogen_lungs - name = "Standard Nitrogen Lungs" - id = "nitrogenlunggeneric" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) - build_path = /obj/item/organ/lungs/nitrogen - category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) - -/datum/design/vox_nitrogen_lungs - name = "Vox Nitrogen Lungs" - id = "nitrogenlungvox" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) - build_path = /obj/item/organ/lungs/nitrogen/vox - category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) - - diff --git a/modular_zubbers/code/modules/designs/limbgrower_designs.dm b/modular_zubbers/code/modules/designs/limbgrower_designs.dm index 7892a16c493..1e3a3bb80e1 100644 --- a/modular_zubbers/code/modules/designs/limbgrower_designs.dm +++ b/modular_zubbers/code/modules/designs/limbgrower_designs.dm @@ -1,18 +1,174 @@ +/datum/design/leftarm + category = list( + RND_CATEGORY_INITIAL, + SPECIES_HUMAN, + SPECIES_FELINE, + SPECIES_LIZARD, + SPECIES_MOTH, + SPECIES_PLASMAMAN, + SPECIES_ETHEREAL, + SPECIES_TAJARAN, + HEMOPHAGE, + SPECIES_SHADEKIN, + SPECIES_TESHARI, + ) + +/datum/design/rightarm + category = list( + RND_CATEGORY_INITIAL, + SPECIES_HUMAN, + SPECIES_FELINE, + SPECIES_LIZARD, + SPECIES_MOTH, + SPECIES_PLASMAMAN, + SPECIES_ETHEREAL, + SPECIES_TAJARAN, + HEMOPHAGE, + SPECIES_SHADEKIN, + SPECIES_TESHARI, + ) + +/datum/design/leftleg + category = list( + RND_CATEGORY_INITIAL, + SPECIES_HUMAN, + SPECIES_FELINE, + SPECIES_LIZARD, + SPECIES_MOTH, + SPECIES_PLASMAMAN, + SPECIES_ETHEREAL, + SPECIES_TAJARAN, + HEMOPHAGE, + SPECIES_SHADEKIN, + SPECIES_TESHARI, + ) + +/datum/design/rightleg + category = list( + RND_CATEGORY_INITIAL, + SPECIES_HUMAN, + SPECIES_FELINE, + SPECIES_LIZARD, + SPECIES_MOTH, + SPECIES_PLASMAMAN, + SPECIES_ETHEREAL, + SPECIES_TAJARAN, + HEMOPHAGE, + SPECIES_SHADEKIN, + SPECIES_TESHARI, + ) + +/datum/design/cat_tail + category = list(SPECIES_FELINE, RND_CATEGORY_INITIAL) + +/datum/design/cat_ears + category = list(SPECIES_FELINE, RND_CATEGORY_INITIAL) + +/datum/design/cat_tongue + category = list(SPECIES_FELINE, RND_CATEGORY_INITIAL) + +/datum/design/ethereal_stomach + category = list(SPECIES_ETHEREAL, RND_CATEGORY_INITIAL) + +/datum/design/ethereal_tongue + category = list(SPECIES_ETHEREAL, RND_CATEGORY_INITIAL) + +/datum/design/ethereal_lungs + category = list(SPECIES_ETHEREAL, RND_CATEGORY_INITIAL) + +/datum/design/ethereal_heart + category = list(SPECIES_ETHEREAL, RND_CATEGORY_INITIAL) + +/datum/design/lizard_tail + category = list(SPECIES_LIZARD, RND_CATEGORY_INITIAL) + +/datum/design/lizard_tongue + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) + category = list(SPECIES_LIZARD, RND_CATEGORY_INITIAL) + +/datum/design/plasmaman_lungs + category = list(SPECIES_PLASMAMAN, RND_CATEGORY_INITIAL) + +/datum/design/plasmaman_tongue + category = list(SPECIES_PLASMAMAN, RND_CATEGORY_INITIAL) + +/datum/design/plasmaman_liver + category = list(SPECIES_PLASMAMAN, RND_CATEGORY_INITIAL) + +/datum/design/plasmaman_stomach + category = list(SPECIES_PLASMAMAN, RND_CATEGORY_INITIAL) + +/datum/design/humanoidbrain + name = "Brain" + id = "blankbrain" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 100) + build_path = /obj/item/organ/brain + category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) + +/datum/design/nitrogen_lungs + name = "Nitrogen-Adapted Lungs" + id = "nitrogenlunggeneric" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) + build_path = /obj/item/organ/lungs/nitrogen + category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) + +/datum/design/vox_nitrogen_lungs + name = "Vox Nitrogen Lungs" + id = "nitrogenlungvox" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) + build_path = /obj/item/organ/lungs/nitrogen/vox + category = list(SPECIES_VOX, RND_CATEGORY_INITIAL) + +/datum/design/cold_lungs + name = "Cold-Adapted Lungs" + id = "coldlungs" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 35) + build_path = /obj/item/organ/lungs/adaptive/cold + category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) + +/datum/design/hot_lungs + name = "Heat-Adapted Lungs" + id = "hotlungs" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 35) + build_path = /obj/item/organ/lungs/adaptive/hot + category = list(SPECIES_HUMAN) + +/datum/design/oxy_lungs + name = "Low-Oxygen-Adapted Lungs" + id = "oxylungs" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 35) + build_path = /obj/item/organ/lungs/oxy + category = list(SPECIES_HUMAN) + +/datum/design/tox_lungs + name = "Toxin-Adapted Lungs" + id = "toxlungs" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 35) + build_path = /obj/item/organ/lungs/toxin + category = list(SPECIES_HUMAN) + /datum/design/hemophage_heart name = "Pulsating Tumor" id = "hemophageheart" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 25, /datum/reagent/blood = 10) build_path = /obj/item/organ/heart/hemophage - category = list("hemophage") + category = list(HEMOPHAGE, RND_CATEGORY_INITIAL) /datum/design/hemophage_liver name = "Corrupted Liver" id = "hemophageliver" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 15, /datum/reagent/blood = 10) build_path = /obj/item/organ/liver/hemophage - category = list("hemophage") + category = list(HEMOPHAGE, RND_CATEGORY_INITIAL) /datum/design/hemophage_stomach name = "Corrupted Stomach" @@ -20,125 +176,99 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) build_path = /obj/item/organ/stomach/hemophage - category = list("hemophage") + category = list(HEMOPHAGE, RND_CATEGORY_INITIAL) /datum/design/hemophage_tongue name = "Corrupted Tongue" id = "hemophagetongue" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 5, /datum/reagent/blood = 10) build_path = /obj/item/organ/tongue/hemophage - category = list("hemophage") + category = list(HEMOPHAGE, RND_CATEGORY_INITIAL) -/obj/item/disk/design_disk/limbs/hemophage - name = "Hemophage Organ Design Disk" - limb_designs = list(/datum/design/hemophage_heart, /datum/design/hemophage_liver, /datum/design/hemophage_stomach, /datum/design/hemophage_tongue) +//Shadekin organs +/datum/design/shadekin_ears + name = "Shadekin Ears" + id = "shadekinears" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 15) + build_path = /obj/item/organ/ears/shadekin + category = list(SPECIES_SHADEKIN, RND_CATEGORY_INITIAL) -/datum/design/limb_disk/hemophage - name = "Hemophage Organ Design Disk" - desc = "Contains designs for hemophage organs for the limbgrower - Tounges, livers, tumors, and stomachs." - id = "limbdesign_hemophage" - build_path = /obj/item/disk/design_disk/limbs/hemophage +/datum/design/shadekin_eyes + name = "Shadekin Eyes" + id = "shadekineyes" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 15) + build_path = /obj/item/organ/eyes/shadekin + category = list(SPECIES_SHADEKIN, RND_CATEGORY_INITIAL) //Tajaran organs -/datum/design/tajaran_eyes - name = "Tajaran eyes" - id = "tajaraneyes" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) - build_path = /obj/item/organ/eyes/tajaran - category = list(SPECIES_TAJARAN) - -/datum/design/tajaran_tongue - name = "Tajaran tounge" - id = "tajarantounge" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) - build_path = /obj/item/organ/tongue/cat/tajaran - category = list(SPECIES_TAJARAN) - /datum/design/tajaran_ears - name = "Tajaran ears" + name = "Tajaran Ears" id = "tajaranears" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) build_path = /obj/item/organ/ears/cat/tajaran - category = list(SPECIES_TAJARAN) + category = list(SPECIES_TAJARAN, RND_CATEGORY_INITIAL) -/datum/design/limb_disk/tajaran - name = "Tajaran Organ Design Disk" - desc = "Contains designs for tajaran organs for the limbgrower - Ears, tounges, and eyes." - id = "limbdesign_tajaran" - build_path = /obj/item/disk/design_disk/limbs/tajaran - -/obj/item/disk/design_disk/limbs/tajaran - name = "Tajaran Organ Design Disk" - limb_designs = list(/datum/design/tajaran_eyes, /datum/design/tajaran_tongue, /datum/design/tajaran_ears) - -//Teshari organs -//Pour one out for the birds. -/datum/design/leftarm/New() - category += list(SPECIES_TESHARI) - return ..() - -/datum/design/rightarm/New() - category += list(SPECIES_TESHARI) - return ..() - -/datum/design/leftleg/New() - category += list(SPECIES_TESHARI) - return ..() - -/datum/design/rightleg/New() - category += list(SPECIES_TESHARI) - return ..() - -/datum/design/teshari_eyes - name = "Teshari eyes" - id = "tesharieyes" +/datum/design/tajaran_eyes + name = "Tajaran Eyes" + id = "tajaraneyes" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) - build_path = /obj/item/organ/eyes/teshari - category = list(SPECIES_TESHARI) + build_path = /obj/item/organ/eyes/tajaran + category = list(SPECIES_TAJARAN, RND_CATEGORY_INITIAL) +/datum/design/tajaran_tongue + name = "Tajaran Tongue" + id = "tajarantounge" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) + build_path = /obj/item/organ/tongue/cat/tajaran + category = list(SPECIES_TAJARAN, RND_CATEGORY_INITIAL) + +//Teshari organs /datum/design/teshari_ears - name = "Teshari ears" + name = "Teshari Ears" id = "teshariears" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) build_path = /obj/item/organ/ears/teshari - category = list(SPECIES_TESHARI) + category = list(SPECIES_TESHARI, RND_CATEGORY_INITIAL) + +/datum/design/teshari_eyes + name = "Teshari Eyes" + id = "tesharieyes" + build_type = LIMBGROWER + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) + build_path = /obj/item/organ/eyes/teshari + category = list(SPECIES_TESHARI, RND_CATEGORY_INITIAL) /datum/design/teshari_tongue - name = "Teshari tongue" + name = "Teshari Tongue" id = "tesharitongue" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) build_path = /obj/item/organ/tongue/teshari - category = list(SPECIES_TESHARI) + category = list(SPECIES_TESHARI, RND_CATEGORY_INITIAL) -/datum/design/cold_lungs - name = "Cold-Adapted Lungs" - id = "coldlungs" +/datum/design/wholehuman + name = "Blank Body" + id = "blankhuman" build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) - build_path = /obj/item/organ/lungs/adaptive/cold - category = list(SPECIES_TESHARI) + reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 600) + build_path = /mob/living/carbon/human/empty + category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) -/datum/design/limb_disk/teshari - name = "Teshari Organ Design Disk" - desc = "Contains designs for teshari organs for the limbgrower - Ears, tounges, and eyes." - id = "limbdesign_teshari" - build_path = /obj/item/disk/design_disk/limbs/teshari +/// Available through TECHWEB_NODE_CYBER_ORGANS_UPGRADED +/obj/item/disk/design_disk/limbs/adaptive_lungs + name = "adaptive lungs organ design disk" + limb_designs = list(/datum/design/hot_lungs, /datum/design/oxy_lungs, /datum/design/tox_lungs) -/obj/item/disk/design_disk/limbs/teshari - name = "Teshari Organ Design Disk" - limb_designs = list(/datum/design/teshari_eyes, /datum/design/teshari_ears, /datum/design/teshari_tongue, /datum/design/cold_lungs) - -/obj/machinery/limbgrower/Initialize(mapload) - categories += list( - "hemophage", - SPECIES_TAJARAN, - SPECIES_TESHARI - ) - . = ..() +/// Available through TECHWEB_NODE_CYBER_ORGANS_UPGRADED +/datum/design/limb_disk/adaptive_lungs + name = "Adaptive Lungs Organ Design Disk" + desc = "Contains designs for genetically modified adaptive lungs for the limbgrower." + id = "limbdesign_adaptive_lungs" + build_path = /obj/item/disk/design_disk/limbs/adaptive_lungs diff --git a/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm b/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm deleted file mode 100644 index fe7b8dbf6ec..00000000000 --- a/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm +++ /dev/null @@ -1,25 +0,0 @@ -// Used for printing dead bodies with the limbgrower -/mob/living/carbon/human/empty - -/mob/living/carbon/human/empty/Initialize(mapload) - . = ..() - death() - - var/obj/item/organ/brain/to_remove = get_organ_slot(ORGAN_SLOT_BRAIN) - QDEL_NULL(to_remove) - -/datum/design/wholehuman - name = "Blank body" - id = "blankhuman" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 600) - build_path = /mob/living/carbon/human/empty - category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) - -/datum/design/humanoidbrain - name = "Blank brain" - id = "blankbrain" - build_type = LIMBGROWER - reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 100) - build_path = /obj/item/organ/brain - category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm index c4c1645d779..037501d6847 100644 --- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm +++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm @@ -1,5 +1,6 @@ // RESEARCH NODES +// cyber nodes /datum/techweb_node/cyber/empathy_implant id = TECHWEB_NODE_EMPATHY_IMPLANT display_name = "Empathic Sensor Implant" @@ -12,6 +13,51 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS) announce_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_MEDICAL) +/datum/techweb_node/cyber/cyber_implants/New() + . = ..() + design_ids += list( + "ci-scanner", + "ci-gloweyes", + "ci-welding", + "ci-medhud", + "ci-sechud", + "ci-diaghud", + "ci-civhud", + "ci-botany", + "ci-janitor", + "ci-lighter", + "ci-razor", + ) + +/datum/techweb_node/cyber/cyber_organs_upgraded/New() + . = ..() + design_ids += list( + "limbdesign_adaptive_lungs", + ) + design_ids -= list( + "ci-gloweyes", + "ci-welding", + ) + +/datum/techweb_node/cyber/combat_implants/New() + . = ..() + design_ids += list( + "ci-mantis", + "ci-flash", + "ci-antisleep", + ) + +/datum/techweb_node/cyber/night_vision_implants + id = TECHWEB_NODE_NIGHT_VISION_IMPLANTS + display_name = "Night vision implants" + description = "Now you can work all night, even if you lost your glasses!" + prereq_ids = list(TECHWEB_NODE_NIGHT_VISION, TECHWEB_NODE_CYBER_IMPLANTS) + design_ids = list( + "ci-nv", + ) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) + + /datum/techweb_node/botanygene id = TECHWEB_NODE_BOTANY_ADV display_name = "Experimental Botanical Engineering" @@ -64,14 +110,6 @@ ) // MEDICAL -/datum/techweb_node/xenobiology/New() - . = ..() - design_ids += list( - "limbdesign_hemophage", - "limbdesign_tajaran", - "limbdesign_teshari", - ) - /datum/techweb_node/cyber/cyber_implants/New() . = ..() design_ids += list( diff --git a/tgstation.dme b/tgstation.dme index 59626d3e9b5..a73d8cd10ec 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -555,6 +555,7 @@ #include "code\__DEFINES\~~bubber_defines\nanites.dm" #include "code\__DEFINES\~~bubber_defines\obj_flags.dm" #include "code\__DEFINES\~~bubber_defines\privacy_policy.dm" +#include "code\__DEFINES\~~bubber_defines\quirks.dm" #include "code\__DEFINES\~~bubber_defines\robot_defines.dm" #include "code\__DEFINES\~~bubber_defines\role_preferences.dm" #include "code\__DEFINES\~~bubber_defines\signals.dm" @@ -8292,7 +8293,6 @@ #include "modular_skyrat\modules\implants\code\augments_eyes.dm" #include "modular_skyrat\modules\implants\code\augments_internal.dm" #include "modular_skyrat\modules\implants\code\medical_designs.dm" -#include "modular_skyrat\modules\implants\code\medical_nodes.dm" #include "modular_skyrat\modules\imported_vendors\code\vendor_containers.dm" #include "modular_skyrat\modules\imported_vendors\code\vendor_food.dm" #include "modular_skyrat\modules\imported_vendors\code\vendor_snacks.dm" @@ -9891,7 +9891,6 @@ #include "modular_zubbers\code\modules\lewd_machinery\clicker.dm" #include "modular_zubbers\code\modules\lewd_machinery\lustwish.dm" #include "modular_zubbers\code\modules\lewd_machinery\sex_barrier.dm" -#include "modular_zubbers\code\modules\limbgrowncorpses\limbgrowerblanks.dm" #include "modular_zubbers\code\modules\liquids\height_floors.dm" #include "modular_zubbers\code\modules\loadout\categories\accessories.dm" #include "modular_zubbers\code\modules\loadout\categories\belts.dm"