Skip to content

Commit

Permalink
Jetpack Module and Cyborg Action Icons for Our Modules (#2857)
Browse files Browse the repository at this point in the history
* Jetpack and Action Icons

* Missed an Commit File

* cyborg module can't hold blood-red magboots

* Revert "cyborg module can't hold blood-red magboots"

This reverts commit 16e650f.

* Update Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
  • Loading branch information
4 people authored Feb 5, 2025
1 parent 6d1d643 commit c9f6d40
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@
damageProtection:
flatReductions:
Heat: 10 # capable of touching light bulbs and stoves without feeling pain!
- type: JetpackUser # DeltaV: Lets cyborgs fly in space

- type: entity
abstract: true
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,8 @@
- PositronicBrain
borg_module:
- BorgModuleTool
- BorgModuleFireExtinguisher
# - BorgModuleFireExtinguisher # Frontier
- BorgModuleJetpack # Frontier
- BorgModuleGPS
- type: ItemSlots
slots:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,7 @@
- BorgModuleHarvesting
- BorgModuleDefibrillator
- BorgModuleAdvancedTreatment
- BorgModuleJetpack # Frontier
- BorgModuleAdvancedParamedic # Frontier
- BorgModuleAdvancedMining # Frontier
- RipleyHarness
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
- JawsOfLife
- UtilityBeltChiefEngineer
- BorgModuleAdvancedTool
- BorgModuleJetpack # Frontier
- NFBlueprintPowerDrill # Frontier
- NFBlueprintJawsOfLife # Frontier
- NFBlueprintWelderExperimental # Frontier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
whitelist:
components:
- NFOreBag
- type: BorgModuleIcon
icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-drill-module }

- type: entity
id: BorgModuleAdvancedParamedic
Expand All @@ -39,3 +41,24 @@
- Gauze10Lingering
- Bloodpack10Lingering
- SyringeBluespace
- type: BorgModuleIcon
icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-paramed-module }

- type: entity
id: BorgModuleJetpack
parent: [ BaseBorgModule, BaseProviderBorgModule ]
name: jetpack cyborg module
components:
- type: Sprite
layers:
- state: generic
- state: icon-jetpack
sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
- type: ItemBorgModule
droppableItems:
- id: JetpackMiniFilled
whitelist:
components:
- Jetpack
- type: BorgModuleIcon
icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: jetpack-module }
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,13 @@
Plastic: 250
Bluespace: 200 # OreBagOfHolding Bluepsace price
Diamond: 100 # MiningDrillDiamond Diamond price

- type: latheRecipe
id: BorgModuleJetpack
result: BorgModuleJetpack
parent: BaseBorgModuleRecipe
materials:
Steel: 500
Glass: 500
Plastic: 250
Gold: 50
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
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC-BY-NC-SA-4.0",
"copyright": "Made by GhostPrince for Frontier Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "adv-drill-module"
},
{
"name": "adv-paramed-module"
},
{
"name": "jetpack-module"
}
]
}
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 @@ -10,6 +10,9 @@
{
"name": "icon-advancedmining"
},
{
"name": "icon-jetpack"
},
{
"name": "icon-paramedic"
}
Expand Down

0 comments on commit c9f6d40

Please sign in to comment.