Skip to content
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.

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

Cyborg Rebalance #34186

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
03f63cb
added mail, moved some things around, and fixed a lot of APCs
Nox38 Nov 18, 2024
3be1bc4
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Nox38 Nov 23, 2024
a92532f
fixed my mistakes
Nox38 Nov 23, 2024
d944324
Moved around and changed equipment of all borgs except service.
Nox38 Jan 2, 2025
8558133
Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/tras…
Nox38 Jan 3, 2025
48a8905
Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spra…
Nox38 Jan 3, 2025
28253fc
Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/tras…
Nox38 Jan 3, 2025
b9ab148
Delete Resources/Maps/meta.yml
Nox38 Jan 3, 2025
c288522
Update trashbag.yml
Nox38 Jan 3, 2025
2271fda
Delete Resources/Prototypes/Maps/meta.yml
Nox38 Jan 3, 2025
08fbe0a
Update borg_modules.yml
Nox38 Jan 3, 2025
790f919
meta is back
Nox38 Jan 3, 2025
252727b
fixed up some issues with the modules and fucked around with the medi…
Nox38 Jan 3, 2025
87fceb6
Revert "meta is back"
ArtisticRoomba Jan 3, 2025
d2341a1
Merge branch 'master' into cyborg-rebalance
ArtisticRoomba Jan 3, 2025
b505d01
fixed one thing and reverted a fuckup
Nox38 Jan 4, 2025
8ec61f3
Finished the mediborg changes.
Nox38 Jan 4, 2025
23039a5
RCD is once again starting equipment for engiborg
Nox38 Jan 4, 2025
7d19c61
Added holoprojector to advanced tools module
Nox38 Jan 4, 2025
e5ddfb3
A bunch of misc fixes + QOL improvements
ArtisticRoomba Jan 4, 2025
a0c9c4a
fix that amazing linter and build fail
ArtisticRoomba Jan 4, 2025
b5ade58
Update Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
Nox38 Jan 4, 2025
288bad5
Update Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_m…
Nox38 Jan 4, 2025
9deef58
Update spray.yml
Nox38 Jan 4, 2025
6b7de79
made the salvborg orebag bigger.
Nox38 Jan 4, 2025
fd52425
Merge branch 'cyborg-rebalance' of https://github.com/Nox38/space-sta…
Nox38 Jan 4, 2025
df08fd2
Improved generic loadout and a few other small things.
Nox38 Jan 5, 2025
f8ebbf5
Removed extra 6 vials from chem modules
Nox38 Jan 6, 2025
8960456
oops left some recipes in
Nox38 Jan 6, 2025
ec5eddc
removed pesky radiation module from cog
Nox38 Jan 6, 2025
2c87621
Merge branch 'space-wizards:master' into cyborg-rebalance
Nox38 Jan 6, 2025
b3d5887
some goober added lingering cable x10 (which I removed) into gate, fi…
Nox38 Jan 6, 2025
8bcd496
Revert "oops left some recipes in"
Nox38 Jan 6, 2025
eefeb7c
–Removing the stuff from the maps was a bad idea so just readded the …
Nox38 Jan 6, 2025
14a936a
completely readded the stupid dumb radiation module that no one uses …
Nox38 Jan 6, 2025
7f6fe4f
Revert "completely readded the stupid dumb radiation module that no o…
ArtisticRoomba Jan 6, 2025
f4b0270
Revert "–Removing the stuff from the maps was a bad idea so just read…
ArtisticRoomba Jan 6, 2025
2ba52c7
Reapply "oops left some recipes in"
ArtisticRoomba Jan 6, 2025
63737f4
Revert "some goober added lingering cable x10 (which I removed) into …
ArtisticRoomba Jan 6, 2025
6823f7d
Revert "removed pesky radiation module from cog"
ArtisticRoomba Jan 6, 2025
3792acd
migrate deleted radiation module and changed lingering cable ID... no…
ArtisticRoomba Jan 6, 2025
53d14dc
Added new sprites!
Nox38 Jan 9, 2025
48f5e84
Rearranged a module, please pass the tests
Nox38 Jan 10, 2025
58df271
Removed unneeded components from borgOreBag
Nox38 Jan 13, 2025
d68223b
added proper attributions
Nox38 Jan 13, 2025
292ba5a
properly added attributions
Nox38 Jan 13, 2025
a3b32e3
Update Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag…
Nox38 Jan 20, 2025
219e7fe
Update Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
Nox38 Jan 20, 2025
d07bb0b
Added power drill to tools module
Nox38 Jan 22, 2025
5612610
Merge remote-tracking branch 'origin/cyborg-rebalance' into cyborg-re…
Nox38 Jan 22, 2025
7616ae6
Merge remote-tracking branch 'origin/master' into cyborg-rebalance
Nox38 Jan 24, 2025
799a363
Merge branch 'master' into cyborg-rebalance
Nox38 Jan 24, 2025
722bced
Added ScarKy0's suggestions
Nox38 Feb 5, 2025
18098cf
forgot trashbag oopsies
Nox38 Feb 5, 2025
d9bc467
Merge branch 'space-wizards:master' into cyborg-rebalance
Nox38 Feb 5, 2025
5509415
added super synth to music module, buffed service modules, added the …
Nox38 Feb 5, 2025
ff8ac2e
Merge branch 'master' into cyborg-rebalance
Nox38 Feb 5, 2025
c5e5368
Merge branch 'cyborg-rebalance' of
Nox38 Feb 5, 2025
590bff9
forgor
Nox38 Feb 5, 2025
1c70c5c
minor spelling mistake
Nox38 Feb 5, 2025
731543f
Fixed things
Nox38 Feb 5, 2025
5b45600
Merge remote-tracking branch 'origin/master' into cyborg-rebalance
Nox38 Feb 10, 2025
b8544d0
Fixed merge conflicts again (something broke the first time)
Nox38 Feb 10, 2025
718294c
Oops, tool was still craftable!
Nox38 Feb 10, 2025
9cc33ab
fixed minor convention mistakes, changed cable module to start with 3…
Nox38 Feb 13, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,14 @@
state: generic
- type: RandomSpawner
rarePrototypes:
- BorgModuleDefibrillator
- BorgModuleAdvancedChemical
- BorgModuleAdvancedCleaning
- BorgModuleClowning
- BorgModuleGardening
- BorgModuleHarvesting
- BorgModuleAdvancedTool

rareChance: 0.1
prototypes:
- BorgModuleCable
- BorgModuleFireExtinguisher
- BorgModuleGPS
- BorgModuleRadiationDetection
- BorgModuleTool
- BorgModuleArtifact
- BorgModuleAnomaly
chance: 0.9
offset: 0.2
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,20 @@
cell_slot:
name: power-cell-slot-component-slot-name-default

- type: entity
parent: HolofanProjector
id: HolofanProjectorBorg
suffix: borg
description: Stops suicidal crew from causing more crew harm during atmos emergencies. Powered by a self-recharging power cell.
components:
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMicroreactor
disableEject: true
swap: false

Nox38 marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: Holoprojector
id: HoloprojectorField
Expand Down
18 changes: 18 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@
Quantity: 0.5
canReact: false

- type: entity
parent: SheetRGlass
id: SheetRGlassLingering0
suffix: Lingering, 0
components:
- type: Stack
lingering: true
count: 0

- type: entity
parent: SheetGlassBase
id: SheetPGlass
Expand Down Expand Up @@ -327,6 +336,15 @@
stackType: ReinforcedPlasmaGlass
count: 1

- type: entity
parent: SheetRPGlass
id: SheetRPGlassLingering0
suffix: Lingering, 0
components:
- type: Stack
lingering: true
count: 0

- type: entity
parent: SheetGlassBase
id: SheetUGlass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,12 @@
- type: Stack
stackType: Plasteel
count: 1

- type: entity
parent: SheetPlasteel
id: SheetPlasteelLingering0
suffix: Lingering, 0
components:
- type: Stack
lingering: true
count: 0
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@
- type: Stack
count: 1

- type: entity
parent: SheetPlasma
id: SheetPlasma0Lingering
name: plasma
suffix: 0, Lingering
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Stack
lingering: true
count: 0

- type: entity
parent: SheetOtherBase
id: SheetPlastic
Expand Down
18 changes: 18 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/parts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,21 @@
- type: Stack
lingering: true
count: 0

- type: entity
parent: FloorTileItemWhite
id: FloorTileItemWhiteLingering0
suffix: Lingering, 0
components:
- type: Stack
lingering: true
count: 0

- type: entity
parent: FloorTileItemDark
id: FloorTileItemDarkLingering0
suffix: Lingering, 0
components:
- type: Stack
lingering: true
count: 0
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,20 @@
materialComposition:
Steel: 100

- type: entity
name: manuvering jet
parent: FireExtinguisher
id: BorgFireExtinguisher
description: Based on fire extingusher technology, the manuvering jet is... well yes, its just a bigger fire extingusher.
components:
- type: SolutionContainerManager
solutions:
spray:
maxVol: 200
reagents:
- ReagentId: Water
Quantity: 200

- type: entity
name: extinguisher spray
id: ExtinguisherSpray
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,35 @@
- type: Tag
tags:
- Spray

- type: entity
name: cyborg spray bottle
description: A pressurized bottle for spraying reagents.
id: BorgSprayBottle
parent: SprayBottle
components:
- type: SolutionContainerManager
solutions:
spray:
maxVol: 200
reagents:
- ReagentId: SpaceCleaner
Quantity: 200

- type: entity
name: cyborg mega spray bottle
id: BorgMegaSprayBottle
parent: SprayBottle
suffix: Empty
description: A high capacity, high pressure spray bottle, for cleaning even the biggest of spills.
components:
- type: SolutionContainerManager
solutions:
spray:
maxVol: 500
reagents:
- ReagentId: SpaceCleaner
Quantity: 500
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
# Vapor

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,14 @@
quickInsert: true
areaInsert: true
areaInsertRadius: 5

- type: entity
name: internal trash bag
id: BorgTrashBag
description: An upgraded trash bag with a massive internal volume.
parent: TrashBag
components:
- type: Storage
maxItemSize: Huge
grid:
- 0,0,10,6
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
41 changes: 30 additions & 11 deletions Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
count: 1

- type: entity
id: Ointment10Lingering
id: Ointment0Lingering
parent: Ointment
suffix: 10, Lingering
suffix: 0, Lingering
components:
- type: Stack
lingering: true
count: 10
count: 0
Nox38 marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
name: regenerative mesh
Expand Down Expand Up @@ -106,6 +106,15 @@
stackType: RegenerativeMesh
count: 1

- type: entity
id: RegenerativeMesh0Lingering
parent: RegenerativeMesh
suffix: 0, Lingering
components:
- type: Stack
lingering: true
count: 0

- type: entity
name: bruise pack
description: A therapeutic gel pack and bandages designed to treat blunt-force trauma.
Expand Down Expand Up @@ -144,13 +153,13 @@
count: 1

- type: entity
id: Brutepack10Lingering
id: Brutepack0Lingering
parent: Brutepack
suffix: 10, Lingering
suffix: 0, Lingering
components:
- type: Stack
lingering: true
count: 10
count: 0
Nox38 marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
name: medicated suture
Expand Down Expand Up @@ -193,6 +202,15 @@
stackType: MedicatedSuture
count: 1

- type: entity
id: MedicatedSuture0Lingering
parent: MedicatedSuture
suffix: 0, Lingering
components:
- type: Stack
lingering: true
count: 0

- type: entity
name: blood pack
description: Contains a groundbreaking universal blood replacement created by Nanotrasen's advanced medical science.
Expand Down Expand Up @@ -224,11 +242,12 @@

- type: entity
parent: Bloodpack
id: Bloodpack10Lingering
suffix: 10, Lingering
id: Bloodpack0Lingering
suffix: 0, Lingering
components:
- type: Stack
lingering: true
count: 0
Nox38 marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: BaseHealingItem
Expand Down Expand Up @@ -298,13 +317,13 @@
count: 1

- type: entity
id: Gauze10Lingering
id: Gauze0Lingering
parent: Gauze
suffix: 10, Lingering
suffix: 0, Lingering
components:
- type: Stack
lingering: true
count: 10
count: 0
Nox38 marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
name: aloe cream
Expand Down
Loading
Loading