cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Research module fixes and small rebalances. (#2096)

Browse Source 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Some general changes and bug fixes required to keep research modules
usable.

Also added on some quality of life features such as a material bag and a
xenobio bag

Changed some the assembly items to be under circuits gripper.

Fixes some issues with not being able to repair synths and moves
surgical drapes and bonesetter into a new small omitool.

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

In the current state of the research module it is broken and has lots of
issues this PR is to fix some of it's issues.

## Proof Of Testing

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

Trust me bro I compiled it and tested it locally.

This is the new image of a fully upgraded research borg looks like.


![image](https://github.com/user-attachments/assets/2f81def0-e2f4-40a7-9dd4-23f1dce227e0)


## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: cut down omitool a small upgrade for the scanner
del: Removed old things
qol: made research borgs actually able to revive and work on synths
balance: research cyborg grippers
fix: research cyborgs not being able to repair synths. research cyborgs
being able to pick up the nuke disk (oops lol).
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
This commit is contained in:
pixelkitty286
2024-09-30 23:34:20 -06:00
committed by GitHub
parent c8f3631433
commit d3defa8a2f
6 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_zubbers/code/game/objects/items/robot/items/storage.dm
+12 -3
View File
@@ -13,10 +13,12 @@
storable = list(
/obj/item/slime_extract,
/obj/item/slimepotion,
/obj/item/disk,
/obj/item/disk/data,
/obj/item/disk/design_disk,
/obj/item/disk/tech_disk,
/obj/item/computer_disk,//ordinance
/obj/item/stock_parts,
/obj/item/reagent_containers/cup/beaker,
/obj/item/assembly/prox_sensor,
/obj/item/healthanalyzer, //To build medibots
/obj/item/borg_restart_board, //To allow repairs
/obj/item/borg/upgrade/rename, //Basics not an upgrade
@@ -24,6 +26,7 @@
/obj/item/mod,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/item/food/monkeycube,
)
/obj/item/borg/apparatus/research/examine()
@@ -32,6 +35,8 @@
. += "The gripper currently has [stored] secured."
. += span_notice(" <i>Alt-click</i> will drop the currently held item. ")
//To build funny little gadgets
/obj/item/borg/apparatus/circuit_sci
name = "Research circuit assembly gripper"
desc = "A complex grasping tool used for working with circuitry."
@@ -45,6 +50,10 @@
/obj/item/integrated_circuit,
/obj/item/circuit_component,
/obj/item/usb_cable,
/obj/item/assembly/signaler,
/obj/item/healthanalyzer, //To build medibots
/obj/item/assembly/prox_sensor,
/obj/item/electronics,
)
/obj/item/borg/apparatus/circuit_sci/examine()
@@ -65,7 +74,7 @@
icon_state = "connector"
storable = list(
/obj/item/mmi,
/obj/item/assembly/flash, //Building borgs
/obj/item/assembly, //unrestricted assembly building
/obj/item/bodypart/arm/left/robot,
/obj/item/bodypart/arm/right/robot,
/obj/item/bodypart/leg/left/robot,
modular_zubbers/code/modules/borgs/code/robot_items.dm
+21 -6
View File
@@ -106,7 +106,8 @@
icon = 'icons/obj/tools.dmi'
icon_state = "inducer-sci"
//illegal teleporter module
//Illegal experimental Dash module
/obj/item/experimental_dash
name = "Exerimental Dash"
desc = "An experimental module that allows for dashing."
@@ -127,15 +128,18 @@
spark_system.set_up(5, 0, src)
spark_system.attach(src)
/obj/item/experimental_dash/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
/obj/item/experimental_dash/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return
return ITEM_INTERACT_SUCCESS
if(cyborg.cell.charge <= charge_cost)//Prevents usage when charge is low
user.balloon_alert(user, "Low charge!")
return
if(!target.density && jaunt?.teleport(user, target))
return ITEM_INTERACT_SUCCESS
if(!interacting_with.density && jaunt?.teleport(user, interacting_with))
cyborg?.cell?.use(charge_cost)
return ITEM_INTERACT_SUCCESS
return NONE
/obj/item/experimental_dash/equipped(mob/user, slot, initial)
. = ..()
@@ -159,7 +163,7 @@
max_charges = 1
charge_rate = 15 SECONDS
beam_length = 1 SECONDS
recharge_sound = null
recharge_sound = 'sound/machines/ding.ogg'
beam_effect = "plasmabeam"
/datum/action/innate/dash/research/GiveAction(mob/viewer) //this action should be invisible
@@ -171,3 +175,14 @@
//No more ghetto
/obj/item/screwdriver/cyborg/power
sharpness = NONE
//Research cyborg omnitool
/obj/item/borg/cyborg_omnitool/research
name = "research omni-toolset"
desc = "A set of engineering tools with a addition of tools to allow synthetic repairs."
omni_toolkit = list(
/obj/item/surgical_drapes/cyborg,
/obj/item/bonesetter/cyborg,
)
modular_zubbers/code/modules/borgs/code/robot_model.dm
+7 -6
View File
@@ -177,34 +177,35 @@
name = "Research"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
/obj/item/extinguisher/mini,
/obj/item/extinguisher,
/obj/item/weldingtool/largetank/cyborg,
/obj/item/borg/cyborg_omnitool/research, // A modded engineering omitool.
/obj/item/borg/cyborghug/medical, // You can now hug and fix synths :3c
/obj/item/multitool/cyborg,
/obj/item/screwdriver/cyborg/power,
/obj/item/crowbar/cyborg/power,
/obj/item/multitool/cyborg,
/obj/item/analyzer,
/obj/item/assembly/signaler/cyborg,
/obj/item/borg/apparatus/sheet_manipulator,
/obj/item/storage/bag/sheetsnatcher/borg,
/obj/item/storage/bag/xeno,
/obj/item/stack/cable_coil,
/obj/item/borg/apparatus/beaker,
/obj/item/borg/apparatus/organ_storage,
/obj/item/borg/apparatus/research,
/obj/item/borg/apparatus/circuit_sci,
/obj/item/storage/part_replacer/cyborg,
/obj/item/surgical_drapes,
/obj/item/healthanalyzer,
/obj/item/experi_scanner,
/obj/item/bonesetter,
/obj/item/stack/medical/gauze,
/obj/item/borg/apparatus/tank_manipulator,
)
radio_channels = list(RADIO_CHANNEL_SCIENCE)
//TODO: Illegal science stuff
emag_modules = list(
/obj/item/borg/stun,
/obj/item/experimental_dash,
/obj/item/borg/apparatus/illegal //To replace malf printers
/obj/item/borg/apparatus/illegal //Get to work unit!
)
cyborg_base_icon = "research"
cyborg_icon_override = CYBORG_ICON_SCI
modular_zubbers/code/modules/borgs/code/robot_upgrade.dm
+11 -1
View File
@@ -52,7 +52,6 @@
. = ..()
model_type += /obj/item/robot_model/sci
model_flags += BORG_MODEL_RESEARCH
items_to_remove = list(/obj/item/surgical_drapes)
// Engineering BRPED
/obj/item/borg/upgrade/rped/Initialize()
@@ -60,6 +59,17 @@
items_to_add = list(/obj/item/storage/part_replacer/bluespace)
items_to_add -= list(/obj/item/storage/part_replacer)
//Upgrade for the experi scanner
/obj/item/borg/upgrade/experi_scanner
name = "Research cyborg BlueSpace Experi-Scanner"
desc = "An upgrade to the Research model cyborg's standard health analyzer."
icon_state = "module_general"
require_model = TRUE
model_type = list(/obj/item/robot_model/sci)
model_flags = BORG_MODEL_RESEARCH
items_to_add = list(/obj/item/experi_scanner/bluespace)
items_to_remove = list(/obj/item/experi_scanner)
// Borg Dom Aura :)
/obj/item/borg/upgrade/dominatrixmodule/action(mob/living/silicon/robot/borg, mob/living/user)
. = ..()
modular_zubbers/code/modules/research/designs/mechfab_designs.dm
+12
View File
@@ -96,3 +96,15 @@
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESEARCH
)
//Some new toys
/datum/design/experi_scanner/bluespace_borg
name = "Cyborg Bluespace Experimental Scanner"
desc = "A version of the experiment scanner that allows for performing experiment scans from a distance."
id = "bs_experi_scanner_cyborg"
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/experi_scanner
category = list(
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESEARCH
)
modular_zubbers/code/modules/research/techweb/all_nodes.dm
+1
View File
@@ -15,6 +15,7 @@
. = ..()
design_ids += list(
"bs_experi_scanner",
"bs_experi_scanner_cyborg",
)
/datum/techweb_node/ai_laws/New()