cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 18:45:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for #91029

Browse Source
This commit is contained in:
Roxy
2025-05-29 16:44:15 -04:00
parent 978395a510
commit ebcce8d3fb
14 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/mothership_astrum.dmm
+5 -5
View File
@@ -87,7 +87,7 @@
/obj/structure/window/spawner/directional/north,
/obj/structure/window/spawner/directional/east,
/obj/structure/window/spawner/directional/west,
/obj/item/organ/cyberimp/arm/medibeam,
/obj/item/organ/cyberimp/arm/toolkit/medibeam,
/turf/open/floor/plating/abductor2,
/area/awaymission/mothership_astrum/halls)
"bl" = (
@@ -864,7 +864,7 @@
/area/awaymission/mothership_astrum/deck3)
"oA" = (
/obj/structure/table/abductor,
/obj/item/organ/cyberimp/arm/janitor,
/obj/item/organ/cyberimp/arm/toolkit/janitor,
/turf/open/floor/plating/abductor,
/area/awaymission/mothership_astrum/halls)
"oF" = (
@@ -1651,7 +1651,7 @@
/obj/structure/window/spawner/directional/east,
/obj/structure/window/spawner/directional/west,
/obj/structure/table/abductor,
/obj/item/organ/cyberimp/arm/hacker,
/obj/item/organ/cyberimp/arm/toolkit/hacker,
/turf/open/floor/mineral/abductor,
/area/awaymission/mothership_astrum/halls)
"BE" = (
@@ -2676,7 +2676,7 @@
/area/awaymission/mothership_astrum/halls)
"Ns" = (
/obj/structure/table/abductor,
/obj/item/organ/cyberimp/arm/armblade,
/obj/item/organ/cyberimp/arm/toolkit/armblade,
/turf/open/floor/mineral/abductor,
/area/awaymission/mothership_astrum/halls)
"Nw" = (
@@ -2741,7 +2741,7 @@
/area/awaymission/mothership_astrum/halls)
"Oa" = (
/obj/structure/table/abductor,
/obj/item/organ/cyberimp/arm/toolset,
/obj/item/organ/cyberimp/arm/toolkit/toolset,
/turf/open/floor/mineral/abductor,
/area/awaymission/mothership_astrum/halls)
"Om" = (
code/datums/station_traits/positive_traits.dm
+3 -3
View File
@@ -297,12 +297,12 @@
/datum/job/blueshield = /obj/item/organ/cyberimp/brain/anti_stun,
/datum/job/nanotrasen_consultant = /obj/item/organ/heart/cybernetic/tier3,
/datum/job/barber = /obj/item/organ/ears/cybernetic/whisper,
/datum/job/corrections_officer = /obj/item/organ/cyberimp/arm/flash,
/datum/job/corrections_officer = /obj/item/organ/cyberimp/arm/toolkit/flash,
/datum/job/orderly = /obj/item/organ/cyberimp/brain/anti_drop,
/datum/job/science_guard = /obj/item/organ/cyberimp/arm/flash,
/datum/job/science_guard = /obj/item/organ/cyberimp/arm/toolkit/flash,
/datum/job/customs_agent = /obj/item/organ/cyberimp/eyes/hud/security,
/datum/job/bouncer = /obj/item/organ/cyberimp/arm/strongarm,
/datum/job/engineering_guard = /obj/item/organ/cyberimp/arm/flash,
/datum/job/engineering_guard = /obj/item/organ/cyberimp/arm/toolkit/flash,
/datum/job/telecomms_specialist = /obj/item/organ/ears/cybernetic/xray,
// BUBBER EDIT END
)
modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm
+2 -2
View File
@@ -28,7 +28,7 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT*10.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 10.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 10.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 10, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 4.5)
construction_time = 2 SECONDS
build_path = /obj/item/organ/cyberimp/arm/surgery/alien
build_path = /obj/item/organ/cyberimp/arm/toolkit/surgery/alien
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN
)
@@ -41,7 +41,7 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list (/datum/material/iron =SHEET_MATERIAL_AMOUNT * 15.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*8.25, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 8.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 3, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 3)
construction_time = 2 SECONDS
build_path = /obj/item/organ/cyberimp/arm/toolset/alien
build_path = /obj/item/organ/cyberimp/arm/toolkit/toolset/alien
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN
)
modular_skyrat/master_files/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
+3 -3
View File
@@ -1,4 +1,4 @@
/obj/item/organ/cyberimp/arm/toolset/alien
/obj/item/organ/cyberimp/arm/toolkit/toolset/alien
name = "integrated alien toolset implant"
desc = "A version of the engineering toolset, designed to be installed on subject's arm. Contain abductor tools."
actions_types = list(/datum/action/item_action/organ_action/toggle/toolkit)
@@ -11,7 +11,7 @@
/obj/item/multitool/abductor,
)
/obj/item/organ/cyberimp/arm/surgery/alien
/obj/item/organ/cyberimp/arm/toolkit/surgery/alien
name = "alien surgical toolset implant"
desc = "A set of alien surgical tools hidden behind a concealed panel on the user's arm."
actions_types = list(/datum/action/item_action/organ_action/toggle/toolkit)
@@ -27,7 +27,7 @@
/obj/item/blood_filter/alien,
)
/obj/item/organ/cyberimp/arm/surgery
/obj/item/organ/cyberimp/arm/toolkit/surgery
items_to_create = list(
/obj/item/retractor/augment,
/obj/item/hemostat/augment,
modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/spawners.dm
+1 -1
View File
@@ -44,7 +44,7 @@
loot = list(/obj/item/organ/heart/cybernetic/tier3 = 10,
/obj/item/clothing/suit/armor/abductor/astrum = 10,
/obj/item/clothing/head/helmet/astrum = 10,
/obj/item/organ/cyberimp/arm/armblade = 5,
/obj/item/organ/cyberimp/arm/toolkit/armblade = 5,
/obj/effect/gibspawner/generic = 10,
/obj/item/organ/eyes/alien = 5,
)
modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
+4 -4
View File
@@ -276,19 +276,19 @@
subcategory = "Cybernetics"
/datum/armament_entry/company_import/deforest/implant/surgery
item_type = /obj/item/organ/cyberimp/arm/surgery
item_type = /obj/item/organ/cyberimp/arm/toolkit/surgery
cost = PAYCHECK_COMMAND * 5
/datum/armament_entry/company_import/deforest/implant/toolset
item_type = /obj/item/organ/cyberimp/arm/toolset
item_type = /obj/item/organ/cyberimp/arm/toolkit/toolset
cost = PAYCHECK_COMMAND * 5
/datum/armament_entry/company_import/deforest/implant/botany
item_type = /obj/item/organ/cyberimp/arm/botany
item_type = /obj/item/organ/cyberimp/arm/toolkit/botany
cost = PAYCHECK_COMMAND * 5
/datum/armament_entry/company_import/deforest/implant/janitor
item_type = /obj/item/organ/cyberimp/arm/janitor
item_type = /obj/item/organ/cyberimp/arm/toolkit/janitor
cost = PAYCHECK_COMMAND * 5
// Modsuit Modules from the medical category, here instead of in Nakamura because nobody buys from this company
modular_skyrat/modules/customization/modules/client/augment/implants.dm
+2 -2
View File
@@ -22,7 +22,7 @@
/datum/augment_item/implant/l_arm/razor_claws
name = "Left Razor Claws"
cost = 4
path = /obj/item/organ/cyberimp/arm/razor_claws/left_arm
path = /obj/item/organ/cyberimp/arm/toolkit/razor_claws/left_arm
//RIGHT ARM IMPLANTS
/datum/augment_item/implant/r_arm
@@ -31,7 +31,7 @@
/datum/augment_item/implant/r_arm/razor_claws
name = "Right Razor Claws"
cost = 4
path = /obj/item/organ/cyberimp/arm/razor_claws/right_arm
path = /obj/item/organ/cyberimp/arm/toolkit/razor_claws/right_arm
//EYES IMPLANTS
/datum/augment_item/implant/eyes
modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm
+5 -5
View File
@@ -200,11 +200,11 @@
new /obj/item/mod/control/pre_equipped/elite(src)
if(5) //Implants
new /obj/item/storage/box/cyber_implants(src)
new /obj/item/organ/cyberimp/arm/combat(src)
new /obj/item/organ/cyberimp/arm/surgery(src)
new /obj/item/organ/cyberimp/arm/baton(src)
new /obj/item/organ/cyberimp/arm/toolset(src)
new /obj/item/organ/cyberimp/arm/gun/taser(src)
new /obj/item/organ/cyberimp/arm/toolkit/combat(src)
new /obj/item/organ/cyberimp/arm/toolkit/surgery(src)
new /obj/item/organ/cyberimp/arm/toolkit/baton(src)
new /obj/item/organ/cyberimp/arm/toolkit/toolset(src)
new /obj/item/organ/cyberimp/arm/toolkit/gun/taser(src)
/obj/structure/closet/crate/secure/tradership_cargo_very_valuable
req_access = ACCESS_FACTION_COMMAND
modular_skyrat/modules/implants/code/augments_arms.dm
+12 -12
View File
@@ -37,14 +37,14 @@
armour_penetration = 10 //Energy isn't as good at going through armor as it is through flesh alone.
hitsound = 'sound/items/weapons/blade1.ogg'
/obj/item/organ/cyberimp/arm/armblade
/obj/item/organ/cyberimp/arm/toolkit/armblade
name = "arm blade implant"
desc = "An integrated blade implant designed to be installed into a persons arm. Stylish and deadly; Although, being caught with this without proper permits is sure to draw unwanted attention."
items_to_create = list(/obj/item/melee/implantarmblade)
icon = 'modular_skyrat/modules/implants/icons/implanted_blade.dmi'
icon_state = "mantis_blade"
/obj/item/organ/cyberimp/arm/armblade/emag_act()
/obj/item/organ/cyberimp/arm/toolkit/armblade/emag_act()
if(obj_flags & EMAGGED)
return FALSE
for(var/datum/weakref/created_item in items_list)
@@ -119,7 +119,7 @@
qdel(stone)
return ..()
/obj/item/organ/cyberimp/arm/razor_claws
/obj/item/organ/cyberimp/arm/toolkit/razor_claws
name = "razor claws implant"
desc = "A set of hidden, retractable blades built into the fingertips; cyborg mercenary approved."
items_to_create = list(/obj/item/knife/razor_claws)
@@ -130,11 +130,11 @@
retract_sound = 'sound/items/sheath.ogg'
/// bespoke subtypes for augs menu since it's a bit wonky
/obj/item/organ/cyberimp/arm/razor_claws/right_arm
/obj/item/organ/cyberimp/arm/toolkit/razor_claws/right_arm
zone = BODY_ZONE_R_ARM
slot = ORGAN_SLOT_RIGHT_ARM_AUG
/obj/item/organ/cyberimp/arm/razor_claws/left_arm
/obj/item/organ/cyberimp/arm/toolkit/razor_claws/left_arm
zone = BODY_ZONE_L_ARM
slot = ORGAN_SLOT_LEFT_ARM_AUG
@@ -145,14 +145,14 @@
button_icon = 'modular_skyrat/master_files/icons/hud/actions.dmi'
button_icon_state = "wolverine"
/obj/item/organ/cyberimp/arm/hacker
/obj/item/organ/cyberimp/arm/toolkit/hacker
name = "hacking arm implant"
desc = "An small arm implant containing an advanced screwdriver, wirecutters, and multitool designed for engineers and on-the-field machine modification. Actually legal, despite what the name may make you think."
icon = 'icons/obj/items_cyborg.dmi'
icon_state = "toolkit_engiborg_multitool"
items_to_create = list(/obj/item/screwdriver/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/abductor/implant)
/obj/item/organ/cyberimp/arm/botany
/obj/item/organ/cyberimp/arm/toolkit/botany
name = "botany arm implant"
desc = "A rather simple arm implant containing tools used in gardening and botanical research."
items_to_create = list(/obj/item/cultivator, /obj/item/shovel/spade, /obj/item/hatchet, /obj/item/gun/energy/floragun, /obj/item/plant_analyzer, /obj/item/geneshears, /obj/item/secateurs, /obj/item/storage/bag/plants, /obj/item/storage/bag/plants/portaseeder)
@@ -176,7 +176,7 @@
tool_behaviour = TOOL_SAW
toolspeed = 1
/obj/item/organ/cyberimp/arm/botany/emag_act()
/obj/item/organ/cyberimp/arm/toolkit/botany/emag_act()
if(obj_flags & EMAGGED)
return FALSE
for(var/datum/weakref/created_item in items_list)
@@ -191,12 +191,12 @@
icon = 'icons/obj/items_cyborg.dmi'
icon_state = "toolkit_engiborg_multitool"
/obj/item/organ/cyberimp/arm/janitor
/obj/item/organ/cyberimp/arm/toolkit/janitor
name = "janitorial tools implant"
desc = "A set of janitorial tools on the user's arm."
items_to_create = list(/obj/item/lightreplacer, /obj/item/holosign_creator, /obj/item/soap/nanotrasen, /obj/item/reagent_containers/spray/cyborg_drying, /obj/item/mop/advanced, /obj/item/paint/paint_remover, /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/spray/cleaner) //Beaker if for refilling sprays
/obj/item/organ/cyberimp/arm/janitor/emag_act()
/obj/item/organ/cyberimp/arm/toolkit/janitor/emag_act()
if(obj_flags & EMAGGED)
return FALSE
for(var/datum/weakref/created_item in items_list)
@@ -206,12 +206,12 @@
obj_flags |= EMAGGED
return TRUE
/obj/item/organ/cyberimp/arm/lighter
/obj/item/organ/cyberimp/arm/toolkit/lighter
name = "lighter implant"
desc = "A... implanted lighter. Incredibly useless."
items_to_create = list(/obj/item/lighter/greyscale) //Hilariously useless.
/obj/item/organ/cyberimp/arm/lighter/emag_act()
/obj/item/organ/cyberimp/arm/toolkit/lighter/emag_act()
if(obj_flags & EMAGGED)
return FALSE
for(var/datum/weakref/created_item in items_list)
modular_skyrat/modules/implants/code/medical_designs.dm
+6 -6
View File
@@ -9,7 +9,7 @@
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/armblade
build_path = /obj/item/organ/cyberimp/arm/toolkit/armblade
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT,
)
@@ -26,7 +26,7 @@
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 20 SECONDS
build_path = /obj/item/organ/cyberimp/arm/razor_claws
build_path = /obj/item/organ/cyberimp/arm/toolkit/razor_claws
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS,
)
@@ -43,7 +43,7 @@
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/flash
build_path = /obj/item/organ/cyberimp/arm/toolkit/flash
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT,
)
@@ -61,7 +61,7 @@
/datum/material/plastic = SHEET_MATERIAL_AMOUNT,
)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/botany
build_path = /obj/item/organ/cyberimp/arm/toolkit/botany
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS,
)
@@ -133,7 +133,7 @@
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/janitor
build_path = /obj/item/organ/cyberimp/arm/toolkit/janitor
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS,
)
@@ -150,7 +150,7 @@
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 100
build_path = /obj/item/organ/cyberimp/arm/lighter
build_path = /obj/item/organ/cyberimp/arm/toolkit/lighter
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC,
)
modular_skyrat/modules/moretraitoritems/code/autosurgeon.dm
+9 -9
View File
@@ -1,36 +1,36 @@
/obj/item/autosurgeon/toolset
starting_organ = /obj/item/organ/cyberimp/arm/toolset
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/toolset
/obj/item/autosurgeon/surgery
starting_organ = /obj/item/organ/cyberimp/arm/surgery
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/surgery
/obj/item/autosurgeon/botany
starting_organ = /obj/item/organ/cyberimp/arm/botany
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/botany
/obj/item/autosurgeon/janitor
starting_organ = /obj/item/organ/cyberimp/arm/janitor
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/janitor
/obj/item/autosurgeon/armblade
starting_organ = /obj/item/organ/cyberimp/arm/armblade
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/armblade
/obj/item/autosurgeon/muscle
starting_organ = /obj/item/organ/cyberimp/arm/strongarm
//syndie
/obj/item/autosurgeon/syndicate/hackerman
starting_organ = /obj/item/organ/cyberimp/arm/hacker
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/hacker
/obj/item/autosurgeon/syndicate/esword_arm
starting_organ = /obj/item/organ/cyberimp/arm/esword
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/esword
/obj/item/autosurgeon/syndicate/nodrop
starting_organ = /obj/item/organ/cyberimp/brain/anti_drop
/obj/item/autosurgeon/syndicate/baton
starting_organ = /obj/item/organ/cyberimp/arm/baton
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/baton
/obj/item/autosurgeon/syndicate/flash
starting_organ = /obj/item/organ/cyberimp/arm/flash
starting_organ = /obj/item/organ/cyberimp/arm/toolkit/flash
//bodypart
/obj/item/autosurgeon/bodypart/r_arm_robotic
modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/organ/cyberimp/arm/power_cord
/obj/item/organ/cyberimp/arm/toolkit/power_cord
name = "charging implant"
desc = "An internal power cord. Useful if you run on elecricity. Not so much otherwise."
items_to_create = list(/obj/item/synth_powercord)
modular_skyrat/modules/synths/code/species/synthetic.dm
+2 -2
View File
@@ -22,7 +22,7 @@
reagent_flags = PROCESS_SYNTHETIC
payday_modifier = 1.0 // Matches the rest of the pay penalties the non-human crew have
species_language_holder = /datum/language_holder/machine
mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
mutant_organs = list(/obj/item/organ/cyberimp/arm/toolkit/power_cord)
mutantbrain = /obj/item/organ/brain/synth
mutantstomach = /obj/item/organ/stomach/synth
mutantears = /obj/item/organ/ears/synth
@@ -222,7 +222,7 @@
transformer.update_body()
/datum/species/synthetic/get_types_to_preload()
return ..() - typesof(/obj/item/organ/cyberimp/arm/power_cord) // Don't cache things that lead to hard deletions.
return ..() - typesof(/obj/item/organ/cyberimp/arm/toolkit/power_cord) // Don't cache things that lead to hard deletions.
/datum/species/synthetic/create_pref_unique_perks()
var/list/perk_descriptions = list()
modular_zubbers/code/modules/jobs/_job.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/datum/job/prisoner
banned_augments = list(/obj/item/organ/cyberimp/arm/razor_claws/left_arm, /obj/item/organ/cyberimp/arm/razor_claws/right_arm)
banned_augments = list(/obj/item/organ/cyberimp/arm/toolkit/razor_claws/left_arm, /obj/item/organ/cyberimp/arm/toolkit/razor_claws/right_arm)