From b0ca137649b6706d04f8ffb86e93f79756e2a620 Mon Sep 17 00:00:00 2001 From: Sir Winters <7543955+Owai-Seek@users.noreply.github.com> Date: Tue, 25 Nov 2025 22:35:05 -0500 Subject: [PATCH] Janiborg Modifications (#4912) ## About The Pull Request - Gives Janiborgs the Experimental Broom round-start. - Comments out the wirebrush upgrade. (It's already there round-start already?) - Gives Janiborgs Cable, RLD, RTD, and Decal Painter upgrades. ## Why It's Good For The Game Allows janiborgs to fix lights and maint-mice wires later in the round. Upgrades them from their shitty-tiles to modern-tiles so they can actually make the kitchen look classy after someone blows it up. Gives them the ability to touch up areas with decals as well, because most engineers are just gonna slap down the pipes/wires and call it a day. ## Proof Of Testing image image image ## Changelog :cl: add: RLD, RTD, Decal Painter, and Cable upgrades for janiborgs. del: wirebrush upgrade, because it's already roundstart. qol: added brooms to janiborgs roundstart /:cl: --- .../mob/living/silicon/robot/robot_model.dm | 1 + .../designs/mechfabricator_designs.dm | 3 ++ .../research/techweb/nodes/cyborg_nodes.dm | 2 +- .../modules/research/techweb/all_nodes.dm | 2 +- .../modules/borg_buffs/code/robot.dm | 2 + .../research/designs/mechfab_designs.dm | 41 +++++++++++++++++++ .../modules/research/techweb/all_nodes.dm | 8 ++++ .../silicons/borgs/code/robot_upgrade.dm | 26 +++++++++++- 8 files changed, 81 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 65771acd56b..fb745ad8591 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -496,6 +496,7 @@ /obj/item/holosign_creator, /obj/item/reagent_containers/spray/cyborg_drying, /obj/item/wirebrush, + /obj/item/pushbroom, // Bubber Addition ) radio_channels = list(RADIO_CHANNEL_SERVICE) emag_modules = list( diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 87626687ce1..8f2a06dba2d 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -1738,6 +1738,8 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL ) +// BUBBERS EDIT. Added as a default module. +/* /datum/design/borg_upgrade_broomer name = "Experimental Push Broom" id = "borg_upgrade_broomer" @@ -1751,6 +1753,7 @@ category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR ) +*/ /datum/design/mmi name = "Man-Machine Interface" diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm index 91e2890a02c..e6f54d9e5d8 100644 --- a/code/modules/research/techweb/nodes/cyborg_nodes.dm +++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm @@ -102,7 +102,7 @@ prereq_ids = list(TECHWEB_NODE_BORG_SERVICES, TECHWEB_NODE_SANITATION) design_ids = list( "borg_upgrade_advancedmop", - "borg_upgrade_broomer", +// "borg_upgrade_broomer", BUBBERS EDIT, ROUNDSTART MODULE "borg_upgrade_expand", "borg_upgrade_prt", "borg_upgrade_plunger", diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm index 61b1cc8bef5..e9d3286d102 100644 --- a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm +++ b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm @@ -286,7 +286,7 @@ "borg_upgrade_clamp", "borg_upgrade_cargo_tele", "borg_upgrade_forging", - "borg_upgrade_brush", +// "borg_upgrade_brush", BUBBERS EDIT, ROUNDSTART MODULE ) return ..() diff --git a/modular_skyrat/modules/borg_buffs/code/robot.dm b/modular_skyrat/modules/borg_buffs/code/robot.dm index 29e775175dd..ef26ac59ed0 100644 --- a/modular_skyrat/modules/borg_buffs/code/robot.dm +++ b/modular_skyrat/modules/borg_buffs/code/robot.dm @@ -113,6 +113,7 @@ icon_state = "misc" default_reagent_types = BASE_SHAKER_MISC_REAGENTS +/* //BUBBERS EDIT This is a default module, it doesn't need to be in upgrades. // Wirebrush for janiborg /datum/design/borg_wirebrush name = "Wire-brush Module" @@ -154,6 +155,7 @@ var/obj/item/wirebrush/brush = new (cyborg.model) cyborg.model.basic_modules += brush cyborg.model.add_module(brush, FALSE, TRUE) +*/ #undef BASE_SHAKER_JUICE_REAGENTS #undef BASE_SHAKER_ALCOHOL_REAGENTS diff --git a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm index 1a924ffd532..4361933485e 100644 --- a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm +++ b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm @@ -146,6 +146,47 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING ) +// JANITOR CYBORG UPGRADES + +/datum/design/borg_upgrade_detailer + name = "Detailing Tools" + id = "borg_upgrade_detailer" + build_type = MECHFAB + build_path = /obj/item/borg/upgrade/detailer + materials = list( + /datum/material/iron =SHEET_MATERIAL_AMOUNT*15.25, + /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.5, + ) + construction_time = 4 SECONDS + category = list( + RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR + ) + +/datum/design/rld_janitor + name = "Cyborg Rapid Lighting Device" + desc = "A device that allows rapid, range deployment of lights and glowsticks." + id = "rld_cyborg_janitor" + build_type = MECHFAB + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 2.5) + build_path = /obj/item/borg/upgrade/rld + category = list( + RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR + ) + +/datum/design/cyborg_cable_coil + name = "Integrated Cable Coil" + desc = "Condensed spooling technology allows cabling technology in janitorial modules." + id = "cable_coil_cyborg" + build_type = MECHFAB + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT, + /datum/material/glass = SHEET_MATERIAL_AMOUNT, + ) + build_path = /obj/item/borg/upgrade/cyborg_cable_coil + category = list( + RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR + ) + /datum/design/xenoarch/equipment/bag_adv_borg name = "Cyborg Advanced Xenoarchaeology Bag" desc = "An improved bag to pick up strange rocks for science" diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm index 87ff2cd4490..127fc1718c7 100644 --- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm +++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm @@ -80,6 +80,14 @@ "rld_cyborg" ) +/datum/techweb_node/borg_utility/New() + design_ids += list( + "borg_upgrade_detailer", + "rld_cyborg_janitor", + "cable_coil_cyborg" + ) + return ..() + /datum/techweb_node/borg_medical/New() design_ids += list( "borg_upgrade_surgicalprocessor_sci", diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm index 93bbd3aec79..fb779cae776 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_upgrade.dm @@ -93,8 +93,8 @@ desc = "An upgrade to allow a cyborg to use a Rapid Lighting Device." icon_state = "module_engineer" require_model = TRUE - model_type = list(/obj/item/robot_model/engineering) - model_flags = BORG_MODEL_ENGINEERING + model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/janitor) + model_flags = list(BORG_MODEL_ENGINEERING, BORG_MODEL_JANITOR) items_to_add = list(/obj/item/construction/rld/cyborg) // Borg Advanced Xenoarchaeology Bag @@ -255,3 +255,25 @@ borg.hasToys = FALSE borg.remove_quirk(/datum/quirk/well_trained) + +/obj/item/borg/upgrade/detailer + name = "janitor detailing toolset" + desc = "Upgrades a janitor cyborgs tiling capabilities while adding the ability to modify floor decals." + icon_state = "module_janitor" + require_model = TRUE + model_type = list(/obj/item/robot_model/janitor) + model_flags = BORG_MODEL_JANITOR + + items_to_add = list(/obj/item/construction/rtd/borg, + /obj/item/airlock_painter/decal/cyborg, + ) + +/obj/item/borg/upgrade/cyborg_cable_coil + name = "integrated cable coil" + desc = "Condensed spooling technology allows cabling technology in janitorial modules." + icon_state = "module_janitor" + require_model = TRUE + model_type = list(/obj/item/robot_model/janitor) + model_flags = BORG_MODEL_JANITOR + + items_to_add = list (/obj/item/stack/cable_coil)