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

Merge branch 'master' into upstream-feb12-2026

Browse Source
This commit is contained in:
Alexis
2026-03-02 07:42:16 -05:00
parent 4dc38c0ad6 b721351dd4
commit 5c5a636485
385 changed files with 227785 additions and 5757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/medical_designs.dm
+3 -3
View File
@@ -631,7 +631,7 @@
)
build_path = /obj/item/organ/cyberimp/chest/spine
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_CYBERNETICS
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -701,7 +701,7 @@
)
build_path = /obj/item/organ/cyberimp/chest/reviver
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_CYBERNETICS
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -927,7 +927,7 @@
)
build_path = /obj/item/organ/heart/cybernetic/anomalock
category = list(
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_EQUIPMENT
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
code/modules/research/machinery/departmental_protolathe.dm
+1 -1
View File
@@ -43,5 +43,5 @@
name = "department protolathe (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
circuit = /obj/item/circuitboard/machine/protolathe/department/security
stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
stripe_color = "#DE3A3A"
payment_department = ACCOUNT_SEC
code/modules/research/machinery/departmental_techfab.dm
+1 -1
View File
@@ -43,5 +43,5 @@
name = "department techfab (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
circuit = /obj/item/circuitboard/machine/techfab/department/security
stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
stripe_color = "#DE3A3A"
payment_department = ACCOUNT_SEC
code/modules/research/techweb/nodes/cyborg_nodes.dm
+4 -2
View File
@@ -162,8 +162,9 @@
design_ids = list(
"ci-breather",
"ci-nutriment",
"ci-nutrimentplus", // BUBBER EDIT - ADDITION
"ci-thrusters",
"ci-herculean",
//"ci-herculean", // BUBBER EDIT - REMOVAL
"ci-connector",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
@@ -183,6 +184,7 @@
"ci-reviver",
"ci-antidrop",
"ci-antistun",
"ci-herculean", // BUBBER EDIT - ADDITION
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
announce_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_MEDICAL)
@@ -193,7 +195,7 @@
description = "Decades of contraband smuggling by assistants have led to the development of a full toolbox that fits seamlessly into your arm."
prereq_ids = list(TECHWEB_NODE_COMBAT_IMPLANTS, TECHWEB_NODE_EXP_TOOLS)
design_ids = list(
"ci-nutrimentplus",
//"ci-nutrimentplus", // BUBBER EDIT - REMOVAL
"ci-surgery",
"ci-surgery-brain",
"ci-toolset",