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

Cargoborg #253

Merged
merged 2 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -68,6 +68,7 @@ petting-success-cleanbot = You pet {THE($target)} on {POSS-ADJ($target)} damp me
petting-success-medibot = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
petting-success-generic-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} metal head.
petting-success-salvage-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dirty metal head.
petting-success-cargo-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} scratched metal head.
petting-success-engineer-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} reflective metal head.
petting-success-janitor-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
petting-success-medical-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
Expand Down
61 changes: 61 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,67 @@
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg

- type: entity
id: BorgChassisCargo
parent: BaseBorgChassisNT
name: cargo cyborg
components:
- type: Sprite
layers:
- state: cargo
map: ["movement"]
- state: cargo_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: cargo_l
shader: unshaded
map: ["light"]
visible: false
- type: SpriteMovement
movementLayers:
movement:
state: cargo_moving
noMovementLayers:
movement:
state: cargo
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleCargo
hasMindState: cargo_e
noMindState: cargo_e_r
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: cargo
name: cargo cyborg
- type: Construction
node: cargo
- type: IntrinsicRadioTransmitter
channels:
- Supply
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Supply
- Binary
- Common
- Science
- type: AccessReader
access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
- type: Inventory
templateId: borgTall
- type: InteractionPopup
interactSuccessString: petting-success-cargo-cyborg
interactFailureString: petting-failure-cargo-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg

- type: entity
id: BorgChassisSyndicateAssault
parent: BaseBorgChassisSyndicate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,96 @@
- Trash
- BorgMiningTorso

# cargo parts
- type: entity
id: LeftArmBorgCargo
parent: BaseBorgArmLeft
name: cargo cyborg left arm
components:
- type: Sprite
state: cargo_l_arm
- type: Icon
state: cargo_l_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgCargoLArm

- type: entity
id: RightArmBorgCargo
parent: BaseBorgArmRight
name: cargo cyborg right arm
components:
- type: Sprite
state: cargo_r_arm
- type: Icon
state: cargo_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgCargoRArm

- type: entity
id: LeftLegBorgCargo
parent: BaseBorgLegLeft
name: cargo cyborg left leg
components:
- type: Sprite
state: cargo_l_leg
- type: Icon
state: cargo_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgCargoLLeg

- type: entity
id: RightLegBorgCargo
parent: BaseBorgLegRight
name: cargo cyborg right leg
components:
- type: Sprite
state: cargo_r_leg
- type: Icon
state: cargo_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgCargoRLeg

- type: entity
id: HeadBorgCargo
parent: BaseBorgHead
name: cargo cyborg head
components:
- type: Sprite
state: cargo_head
- type: Icon
state: cargo_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgCargoHead

- type: entity
id: TorsoBorgCargo
parent: BaseBorgTorso
name: cargo cyborg torso
components:
- type: Sprite
state: cargo_chest
- type: Icon
state: cargo_chest
- type: Tag
tags:
- Trash
- BorgCargoTorso

# service parts
- type: entity
id: LeftArmBorgService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,30 @@
whitelist:
tags:
- BorgMiningTorso
cargo_l_arm+o:
whitelist:
tags:
- BorgCargoLArm
cargo_r_arm+o:
whitelist:
tags:
- BorgCargoRArm
cargo_l_leg+o:
whitelist:
tags:
- BorgCargoLLeg
cargo_r_leg+o:
whitelist:
tags:
- BorgCargoRLeg
cargo_head+o:
whitelist:
tags:
- BorgCargoHead
cargo_chest+o:
whitelist:
tags:
- BorgCargoTorso
medical_l_arm+o:
whitelist:
tags:
Expand Down Expand Up @@ -212,6 +236,13 @@
- BorgMiningRLeg
- BorgMiningHead
- BorgMiningTorso
cargo:
- BorgCargoLArm
- BorgCargoRArm
- BorgCargoLLeg
- BorgCargoRLeg
- BorgCargoHead
- BorgCargoTorso
- type: Construction
graph: Cyborg
node: start
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,12 @@
- RightLegBorgMining
- HeadBorgMining
- TorsoBorgMining
- LeftArmBorgCargo
- RightArmBorgCargo
- LeftLegBorgCargo
- RightLegBorgCargo
- HeadBorgCargo
- TorsoBorgCargo
- LeftArmBorgService
- RightArmBorgService
- LeftLegBorgService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,34 @@
- tool: Screwing
doAfter: 0.5

- to: cargo
steps:
- assemblyId: cargo
guideString: borg-construction-guide-string

- material: Cable
amount: 1
doAfter: 1
store: part-container

- component: Flash
name: flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash

- component: Flash
name: second flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash

- tool: Screwing
doAfter: 0.5


- to: service
steps:
- assemblyId: service
Expand Down Expand Up @@ -191,6 +219,9 @@
- node: mining
entity: BorgChassisMining

- node: cargo
entity: BorgChassisCargo

- node: medical
entity: BorgChassisMedical

Expand Down
54 changes: 54 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/robotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,60 @@
Steel: 250
Glass: 100

- type: latheRecipe
id: LeftArmBorgCargo
result: LeftArmBorgCargo
category: Robotics
completetime: 2
materials:
Steel: 250
Glass: 100

- type: latheRecipe
id: RightArmBorgCargo
result: RightArmBorgCargo
category: Robotics
completetime: 2
materials:
Steel: 250
Glass: 100

- type: latheRecipe
id: LeftLegBorgCargo
result: LeftLegBorgCargo
category: Robotics
completetime: 2
materials:
Steel: 250
Glass: 100

- type: latheRecipe
id: RightLegBorgCargo
result: RightLegBorgCargo
category: Robotics
completetime: 2
materials:
Steel: 250
Glass: 100

- type: latheRecipe
id: HeadBorgCargo
result: HeadBorgCargo
category: Robotics
completetime: 2
materials:
Steel: 250
Glass: 100

- type: latheRecipe
id: TorsoBorgCargo
result: TorsoBorgCargo
category: Robotics
completetime: 2
materials:
Steel: 250
Glass: 100

- type: latheRecipe
id: LeftArmBorgService
result: LeftArmBorgService
Expand Down
18 changes: 18 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,24 @@
- type: Tag
id: BorgArm

- type: Tag
id: BorgCargoHead

- type: Tag
id: BorgCargoLArm

- type: Tag
id: BorgCargoLLeg

- type: Tag
id: BorgCargoRArm

- type: Tag
id: BorgCargoRLeg

- type: Tag
id: BorgCargoTorso

- type: Tag
id: BorgEngineerHead

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading