Skip to content

Commit

Permalink
Merge pull request #486 from fenndragon/salvborg
Browse files Browse the repository at this point in the history
Salvage Quad Borg
  • Loading branch information
Fansana authored Jan 18, 2025
2 parents 848c9cf + aaa9fab commit 07be707
Show file tree
Hide file tree
Showing 14 changed files with 142 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,31 @@
whitelist:
tags:
- BorgGenericTorso
borg_l_salvarm+o:
whitelist:
tags:
- BorgMiningLLeg
borg_r_salvarm+o:
whitelist:
tags:
- BorgMiningRLeg
borg_l_salvleg+o:
whitelist:
tags:
- BorgMiningLLeg
borg_r_salvleg+o:
whitelist:
tags:
- BorgMiningRLeg
borg_salvhead+o:
whitelist:
tags:
- BorgMiningHead
borg_salvchest+o:
whitelist:
tags:
- BorgMiningTorso

- type: PartAssembly
parts:
quadborg:
Expand All @@ -272,6 +297,13 @@
- BorgGenericRLeg
- BorgGenericHead
- BorgGenericTorso
quadsalv:
- BorgMiningLLeg
- BorgMiningRLeg
- BorgMiningLLeg
- BorgMiningRLeg
- BorgMiningHead
- BorgMiningTorso
- type: Construction
graph: Cyborg
node: start
Expand Down
50 changes: 50 additions & 0 deletions Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
- Common
- Science
- type: ActiveRadio
channels:
- Security
- Binary
- Common
- Science
- type: BorgChassis
maxModules: 4
moduleWhitelist:
Expand Down Expand Up @@ -67,3 +72,48 @@
shader: unshaded
map: ["light"]
visible: false

- type: entity
id: BorgChassisQuadsalv
parent: BorgChassisQuad
components:
- type: Sprite
sprite: Floof/Mobs/Silicon/quad.rsi
scale: 0.7, 0.7
layers:
- state: quadspritesalv
map: ["movement"]
- state: quadspritesalvl
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: quadspritesalvr
shader: unshaded
map: ["light"]
visible: false
- type: IntrinsicRadioTransmitter
channels:
- Supply
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Supply
- Binary
- Common
- Science
- type: Construction
node: cyborg
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleCargo
hasMindState: quadspritesalvl
noMindState: quadspritesalvr
- type: AccessReader
access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
- type: SiliconLawProvider
laws: Corporate
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,33 @@

- tool: Screwing
doAfter: 0.5

- to: Quadsalv
steps:
- assemblyId: quadsalv
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: engineer
steps:
Expand Down Expand Up @@ -211,6 +238,9 @@

- node: Quadborg
entity: BorgChassisQuad

- node: Quadsalv
entity: BorgChassisQuadsalv

- node: engineer
entity: BorgChassisEngineer
Expand Down
12 changes: 12 additions & 0 deletions Resources/Textures/Floof/Mobs/Silicon/quad.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@
{
"name": "quadspriteCC",
"directions": 4
},
{
"name": "quadspritesalvl",
"directions": 4
},
{
"name": "quadspritesalvr",
"directions": 4
},
{
"name": "quadspritesalv",
"directions": 4
}

]
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
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.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,24 @@
{
"name": "borg_head+o"
},
{
"name": "borg_l_salvleg+o"
},
{
"name": "borg_r_salvleg+o"
},
{
"name": "borg_l_salvarm+o"
},
{
"name": "borg_r_salvarm+o"
},
{
"name": "borg_salvchest+o"
},
{
"name": "borg_salvhead+o"
},
{
"name": "quad_suit"
}
Expand Down

0 comments on commit 07be707

Please sign in to comment.