Skip to content

Borg Module Overhaul #4275

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

Open
thoughtlessuser wants to merge 14 commits into
base: main
Choose a base branch
from
+626 −242
Open

Borg Module Overhaul #4275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
97ff2c1
borgupdate
thoughtlessuser Jul 14, 2026
4730d70
Merge https://github.com/thoughtlessuser/MyMonolith into borgmedupdate
thoughtlessuser Jul 14, 2026
6cb7191
Merge https://github.com/thoughtlessuser/MyMonolith into borgmedupdate
thoughtlessuser Jul 14, 2026
5b10e21
tweaks
thoughtlessuser Jul 14, 2026
9b3aebb
linters
thoughtlessuser Jul 14, 2026
53b7af1
morelinters
thoughtlessuser Jul 14, 2026
8c1bea6
last2maybe
thoughtlessuser Jul 14, 2026
863ea2e
guidebook
thoughtlessuser Jul 14, 2026
227637e
sprite
thoughtlessuser Jul 14, 2026
dc07b7a
moreminimize
thoughtlessuser Jul 14, 2026
e40899f
monotag
thoughtlessuser Jul 14, 2026
64b9a44
mergconf
thoughtlessuser Jul 14, 2026
efd235c
Merge branch 'main' into borgmedupdate
thoughtlessuser Jul 14, 2026
bd640e6
Merge branch 'main' into borgmedupdate
thoughtlessuser Jul 14, 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
2 changes: 1 addition & 1 deletion Resources/Maps/Dungeon/mineshaft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ entities:
- type: Transform
pos: 24.5,32.5
parent: 2
- proto: BorgModuleGPS
- proto: BorgModuleSurveillance
entities:
- uid: 800
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/Dungeon/mineshaft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ entities:
- type: Transform
pos: 24.5,32.5
parent: 2
- proto: BorgModuleGPS
- proto: BorgModuleSurveillance
entities:
- uid: 800
components:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@
- BorgModuleAdvancedCleaning
- BorgModuleClowning
- BorgModuleGardening
- BorgModuleHarvesting
# - BorgModuleHarvesting
rareChance: 0.1
prototypes:
- BorgModuleCable
- BorgModuleFireExtinguisher
- BorgModuleGPS
- BorgModuleRadiationDetection
- BorgModuleSurveillance
# - BorgModuleRadiationDetection
- BorgModuleTool
- BorgModuleArtifact
- BorgModuleAnomaly
# - BorgModuleAnomaly
chance: 0.9
offset: 0.2
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
selectedBorgType: service
- type: BorgSwitchableSubtype # Goobstation
borgSubtype: default_service

- type: entity
id: BorgChassisSyndicateAssault
parent: BaseBorgChassisSyndicate
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@
- BorgModuleTool
# - BorgModuleFireExtinguisher # Frontier
- BorgModuleJetpack # Frontier
- BorgModuleGPS
- BorgModuleSurveillance
- type: ItemSlots
slots:
cell_slot:
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@
parent: DrinkGlassBase
id: DrinkGlass
components:
# Mono tag
- type: Tag
tags:
- Bartending
# tag end
- type: Sprite
sprite: Objects/Consumable/Drinks/glass_clear.rsi
layers:
Expand Down Expand Up @@ -130,6 +135,11 @@
parent: DrinkGlassBase
id: DrinkGlassCoupeShaped
components:
# Mono tag
- type: Tag
tags:
- Bartending
# tag end
- type: Sprite
sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi
layers:
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
name: shaker
description: The trusty mixing buddy of the bartender.
components:
# Mono tag
- type: Tag
tags:
- Bartending
# tag end
- type: SolutionContainerManager
solutions:
drink:
Expand Down Expand Up @@ -71,6 +76,11 @@
fillBaseName: fill
inHandsMaxFillLevels: 1
inHandsFillBaseName: -fill-
# Mono tag
- type: Tag
tags:
- Bartending
# tag end

- type: entity
parent: DrinkGlassBase
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,16 @@
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default

- type: entity # Mono
id: HandheldCrewMonitorBorg
parent: HandheldCrewMonitor
suffix: Borg
components:
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMicroreactor
disableEject: true
swap: false
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@
parent: [BodyBag, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium
suffix: folded
components:
- type: Tag
tags:
- FoldedBodyBag # Mono
- type: Foldable
folded: true
# - type: BodyBagItem #TODO: we need some kind of generic placable, like thus:
Expand Down
Loading
Loading