Skip to content

Science Cyborg Model + Engineering Cyborg RPED Basekit #11724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SirNightKnight merged 83 commits into from
Jun 3, 2026
Merged

Science Cyborg Model + Engineering Cyborg RPED Basekit #11724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
53d2271
merging robots.dmi
Runian May 27, 2026
bfbf058
science cyborg sprites + skins
Runian May 27, 2026
8a2ed47
science model selectable + module + clockwork
Runian May 27, 2026
df3fa04
some modules + initial commentary for the future
Runian May 27, 2026
b264200
comment these out for now
Runian May 27, 2026
541a574
lots of combining, shuffling, and thoughts
Runian May 27, 2026
11a251e
Merge branch 'Monkestation:master' into science-cyborg-model-v2
Runian May 27, 2026
3916ee3
(slime) vacuum pack changes so it can be standalone
Runian May 28, 2026
891d323
forgot to save this
Runian May 28, 2026
84b0321
add this to emag + experi stuff
Runian May 28, 2026
102fee7
move from roundstart module to techweb locked + sprite
Runian May 28, 2026
7f60849
turns out i dont need to do a radial wheel
Runian May 28, 2026
088cd64
shuffle shuffle
Runian May 28, 2026
0ab36b2
various upgrades
Runian May 28, 2026
8508c79
wording
Runian May 28, 2026
17f65eb
nitpicks
Runian May 28, 2026
755a74e
bs stuff
Runian May 28, 2026
c484015
typo?
Runian May 28, 2026
9cc6196
grammar
Runian May 28, 2026
02bd55d
eh
Runian May 28, 2026
19aeb69
typo
Runian May 28, 2026
a4c67f3
society
Runian May 28, 2026
cb1942c
silicons can't bleed. probably. (fix runtime)
Runian May 28, 2026
0399edc
roundstart model + xenobio is upgrade
Runian May 28, 2026
b8ebe29
material cost increase for balance
Runian May 28, 2026
053253c
forgor
Runian May 28, 2026
cc10335
waaa
Runian May 28, 2026
3626503
why was this here
Runian May 28, 2026
5540d1b
roundstart again + no hats or badges
Runian May 28, 2026
f857f2f
consistency in naming
Runian May 28, 2026
58c8bfe
Merge branch 'master' into science-cyborg-model-v2
Runian May 28, 2026
76dbf10
replace find /obj/item/vacuum_pack ->/obj/item/slime_vacuum
Runian May 28, 2026
c5b81fd
Merge branch 'science-cyborg-model-v2' of https://github.com/Runian/M…
Runian May 28, 2026
906eaee
then /obj/item/slime_vacuum -> /obj/item/vacuum_pack because i want t…
Runian May 28, 2026
19e11de
then i realized that they all need to be backpacks now
Runian May 28, 2026
0b7c59d
another find replace
Runian May 28, 2026
cc79d9d
gonna happytime
Runian May 28, 2026
678e9cc
allows silicon panic teleport on emp too instead of pass / instant gib
Runian May 29, 2026
6adb49b
better no bleed
Runian May 29, 2026
c05d018
what if you got no eyelights
Runian May 29, 2026
c33d384
replaces emag module with ghetto wormhole thingy
Runian May 29, 2026
502b7be
you either teleport or do nothing.
Runian May 29, 2026
4ae5395
Merge branch 'master' into science-cyborg-model-v2
Runian May 29, 2026
dda7758
since we're not using the syndie teleporter anymore, revert this
Runian May 29, 2026
1207d59
circuits (as upgrade, of course)
Runian May 29, 2026
fd70a9a
adds /obj/item/artifact_summon_wand to storable
Runian May 29, 2026
5b6ad18
Merge branch 'master' into science-cyborg-model-v2
Runian May 29, 2026
442592f
rped fix, tank disp + pipe disp to ordnance
Runian May 29, 2026
b80e6c6
slimecore machine stuff
Runian May 29, 2026
bda2179
i NEED consistency; research -> science
Runian May 29, 2026
8d84bb7
blacklist nuke disk from being picked up
Runian May 29, 2026
22321cc
Update code/game/objects/items/robot/items/storage.dm
Runian May 30, 2026
26e57aa
Update monkestation/code/modules/slimecore/items/vacuum_pack.dm
Runian May 30, 2026
7794b09
Update monkestation/code/modules/slimecore/items/vacuum_pack.dm
Runian May 30, 2026
2bb7a71
whoops
Runian May 30, 2026
84e8a85
Update monkestation/code/modules/slimecore/items/vacuum_pack.dm
Runian May 30, 2026
77bd596
Update code/game/objects/items/robot/items/tools.dm
Runian May 30, 2026
be9ea70
review 1
Runian May 30, 2026
e2d5483
Update code/game/objects/items/robot/items/storage.dm
Runian May 30, 2026
e668bbe
Merge branch 'science-cyborg-model-v2' of https://github.com/Runian/M…
Runian May 30, 2026
eea82b1
fixed suggested changes (it used spaces instead of tab)
Runian May 30, 2026
a30e129
review 2
Runian May 30, 2026
517881b
suggested change missing a )
Runian May 30, 2026
fb665bd
why is there more spaces
Runian May 30, 2026
a44d29c
Update monkestation/code/modules/slimecore/items/vacuum_pack.dm
Runian May 30, 2026
f19c309
fix ooze compressor secondary
Runian May 30, 2026
5f0e014
Merge branch 'science-cyborg-model-v2' of https://github.com/Runian/M…
Runian May 30, 2026
0ca0c43
new check
Runian May 30, 2026
f01552d
multiline our designs
Runian May 30, 2026
448728d
replace name_of_mobs
Runian May 30, 2026
16776be
put_in_apparatus stuff
Runian May 30, 2026
a633af7
Merge branch 'master' into science-cyborg-model-v2
Runian May 30, 2026
5115fbc
typepath name (cuz vaccum says "Unknown")
Runian May 30, 2026
7403b3c
Merge branch 'science-cyborg-model-v2' of https://github.com/Runian/M…
Runian May 30, 2026
0a343d5
rename var
Runian May 30, 2026
e8922b4
istype returned false?
Runian May 30, 2026
81ce9ac
ya idk why this is still returning false. goodbye check
Runian May 30, 2026
dd0c5b6
nvm im dumb
Runian May 30, 2026
7131b4c
list these upgrades accordingly in mechfab
Runian Jun 2, 2026
f4564db
keep the syringe and dropper
Runian Jun 3, 2026
a351a97
ok it works
Runian Jun 3, 2026
f2afa00
removes all changes (hopefully) related to hypospray
Runian Jun 3, 2026
cb69518
Merge branch 'master' into science-cyborg-model-v2
Runian Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/deepstorage.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4741,8 +4741,8 @@
dir = 10
},
/obj/structure/table/glass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron/white/textured,
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76264,9 +76264,9 @@
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"oJC" = (
Expand Down Expand Up @@ -109850,9 +109850,9 @@
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"vfe" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26036,7 +26036,7 @@
pixel_y = 8
},
/obj/item/wirecutters,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23239,8 +23239,8 @@
},
/obj/item/storage/box/petridish,
/obj/effect/turf_decal/siding/purple,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"fva" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Graveyard/Graveyard.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39993,8 +39993,8 @@
dir = 1
},
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/structure/table/glass,
/turf/open/floor/iron,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Heliostation/Heliostation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45411,8 +45411,8 @@
dir = 8
},
/obj/structure/table/glass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron/white,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29216,7 +29216,7 @@
"iVT" = (
/obj/structure/table/glass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"iVU" = (
Expand Down Expand Up @@ -54486,7 +54486,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/table/glass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"qEx" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/KiloStation/KiloStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48300,9 +48300,9 @@
/area/station/maintenance/port/greater)
"paV" = (
/obj/structure/table/reinforced/plasmarglass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49721,9 +49721,9 @@
/area/station/command/bridge)
"xMr" = (
/obj/structure/table/glass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26437,8 +26437,8 @@
dir = 1
},
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/structure/table/glass,
/turf/open/floor/iron,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Oshan/Oshan.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72519,8 +72519,8 @@
},
/obj/effect/turf_decal/trimline/purple/filled/corner,
/obj/structure/table,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron/white,
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/Ouroboros/Ouroboros.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23202,10 +23202,10 @@
/obj/structure/table/glass,
/obj/machinery/light/cold/directional/east,
/obj/item/radio/intercom/directional/east,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/PubbyStation/PubbyStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16660,8 +16660,8 @@
/obj/structure/table/glass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"bqH" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Theseus/Theseus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38515,8 +38515,8 @@
/obj/structure/cable,
/obj/effect/mapping_helpers/apc/cell_10k,
/obj/machinery/airalarm/directional/east,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/storage/box/monkeycubes{
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/Voidraptor/VoidRaptor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66233,11 +66233,11 @@
},
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/machinery/firealarm/directional/south,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/iron/white/textured_edge{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27767,7 +27767,7 @@
/area/centcom/central_command_areas/adminroom)
"oLl" = (
/obj/structure/table/glass/plasmaglass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/effect/turf_decal/stripes/line{
dir = 8
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/tramstation/tramstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25113,8 +25113,8 @@
dir = 4
},
/obj/structure/table/glass,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack,
/obj/item/vacuum_pack/backpack,
/obj/item/vacuum_pack/backpack,
/turf/open/floor/stone,
/area/station/science/xenobiology)
"gNu" = (
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/exosuit_fab.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#define BORG_MODEL_ENGINEERING (1<<4)
/// Module is compatible with Peacekeeper Cyborg model
#define BORG_MODEL_PEACEKEEPER (1<<5)
/// Module is compatible with Science Cyborg model
#define BORG_MODEL_SCIENCE (1<<6)

/// Module is compatible with Ripley Exosuit models
#define EXOSUIT_MODULE_RIPLEY (1<<0)
Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/research/research_categories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR "/Janitorial Cyborgs"
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SECURITY "/Security Cyborgs"
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING "/Mining Cyborgs"
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_PEACEKEEPER "/Peacekeeper Cyborgs" //Monkestation addition
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_PEACEKEEPER "/Peacekeeper Cyborgs"
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SCIENCE "/Science Cyborgs"

#define RND_CATEGORY_MODSUITS "/MOD Suits"
#define RND_SUBCATEGORY_MODUITS_CHASSIS "/Chassis"
Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/~monkestation/robots.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GLOBAL_LIST_EMPTY(cyborg_base_models_icon_list)
"Miner" = /obj/item/robot_model/miner,
"Janitor" = /obj/item/robot_model/janitor,
"Service" = /obj/item/robot_model/service,
"Science" = /obj/item/robot_model/science,
"Standard" = /obj/item/robot_model/standard,
)
if(!CONFIG_GET(flag/disable_peaceborg))
Expand All @@ -25,7 +26,7 @@ GLOBAL_LIST_EMPTY(cyborg_base_models_icon_list)
for(var/option in GLOB.cyborg_model_list)
var/obj/item/robot_model/model = GLOB.cyborg_model_list[option]
var/model_icon = initial(model.cyborg_base_icon)
valid_base_models[option] = image(icon = 'monkestation/icons/mob/robots.dmi', icon_state = model_icon)
valid_base_models[option] = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = model_icon)
GLOB.cyborg_base_models_icon_list = valid_base_models

#define CYBORG_ICON_CARGO 'monkestation/code/modules/cargoborg/icons/robots_cargo.dmi'
Expand Down
70 changes: 53 additions & 17 deletions code/game/objects/items/robot/items/storage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
icon_state = "hugmodule"
/// The item stored inside of this apparatus
var/obj/item/stored
/// Whitelist of types allowed in this apparatus
/// Whitelist of types (and its subtypes) that are allowed in this apparatus.
var/list/storable = list()
/// Blacklist of types (and its subtypes) that are not allowed in this apparatus.
var/list/blacklisted_storables = list()

/obj/item/borg/apparatus/Initialize(mapload)
RegisterSignal(loc.loc, COMSIG_BORG_SAFE_DECONSTRUCT, PROC_REF(safedecon))
Expand Down Expand Up @@ -48,6 +50,7 @@
if(!stored || !issilicon(user))
return ..()
stored.attack_self(user)

/obj/item/borg/apparatus/attack_self_secondary(mob/living/silicon/robot/user)
if(!stored || !issilicon(user))
return ..()
Expand All @@ -66,24 +69,33 @@
else
return ..()

/// Checks if the item is allowed to be inside of the apparatus.
/obj/item/borg/apparatus/proc/itemcheck(atom/atom)
for(var/storable_type in storable)
if(istype(atom, storable_type))
return TRUE
return FALSE
if(is_type_in_list(atom, blacklisted_storables))
return FALSE
return is_type_in_list(atom, storable)

/obj/item/borg/apparatus/proc/put_in_apparatus(atom/atom, mob/user)
if(!stored)
if((istype(atom.loc, /mob/living/silicon/robot) && (atom == user)) || (istype(atom.loc, /obj/item/robot_model) && (atom == user)) || HAS_TRAIT(atom, TRAIT_NODROP))
return FALSE // Borgs should not be grabbing their own modules
if(itemcheck(atom))
var/obj/item/item = atom
item.forceMove(src)
stored = item
RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon))
update_appearance()
return TRUE
return FALSE
/// Attempts to put the item into the apparatus.
/obj/item/borg/apparatus/proc/put_in_apparatus(obj/item/storing_item, mob/user)
if(stored)
return FALSE
if(!istype(storing_item))
return FALSE
if(HAS_TRAIT(storing_item, TRAIT_NODROP))
return
if(storing_item == user)
if(istype(storing_item.loc, /mob/living/silicon/robot))
return FALSE
else if(istype(storing_item.loc, /obj/item/robot_model))
return FALSE
if(!itemcheck(storing_item))
return FALSE
var/obj/item/item = storing_item
item.forceMove(src)
stored = item
RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon))
update_appearance()
return TRUE

/obj/item/borg/apparatus/pre_attack(atom/atom, mob/living/user, params)
if(LAZYACCESS(params, RIGHT_CLICK))
Expand Down Expand Up @@ -249,6 +261,11 @@
desc = "A container for holding and application of various monster organs."
storable = list(/obj/item/organ/internal/monster_core)

/obj/item/borg/apparatus/organ_storage/limb
name = "limb storage bag"
desc = "A container for holding limbs."
storable = list(/obj/item/bodypart)

@Tractor-Maam Tractor-Maam May 28, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably just be replaced with the regular organ bag, since that also supports limbs.

@Runian Runian May 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Limbs is all that is needed for artifacts (robotic / organic touch). I could just switch to the organ bag for simplicity's sake if needed.


///Apparatus to allow Engineering/Sabo borgs to manipulate any material sheets.
/obj/item/borg/apparatus/sheet_manipulator
name = "material manipulation apparatus"
Expand Down Expand Up @@ -328,6 +345,25 @@
to_chat(user, span_warning("This circuit board doesn't seem to have standard robot apparatus pin holes. You're unable to pick it up."))
return ..()

/obj/item/borg/apparatus/circuit/science
name = "science manipulation apparatus"
desc = "A special apparatus for carrying various stock parts, disks, assemblies, and even artifacts!"
storable = list(
/obj/item/stock_parts,
/obj/item/assembly,
/obj/item/disk,
/obj/item/artifact_item,
/obj/item/artifact_item_tiny,
/obj/item/gun/magic/artifact,
/obj/item/melee/artifact,
/obj/item/artifact_summon_wand,
/obj/item/slime_mutation_syringe,
/obj/item/borg_restart_board
)
blacklisted_storables = list(
/obj/item/disk/nuclear
)

//apparatus to allow borgs to cook
/obj/item/borg/apparatus/cooking
name = "service storage apparatus"
Expand Down
Loading
Loading