Skip to content

Commit

Permalink
RSI Cleanup (#958)
Browse files Browse the repository at this point in the history
* Cleanup

* I Forgor
  • Loading branch information
dvir001 authored Jan 30, 2024
1 parent 70507c3 commit dbc7121
Show file tree
Hide file tree
Showing 155 changed files with 75 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,9 @@
- HighImpassable
- type: GrapplingProjectile

# Frontier projectiles
# The game wont allow them to sit under _NF.

- type: entity
id: BaseBulletEmp
name: base bullet emp
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description: A backpack produced by Arcadia Industries
components:
- type: Sprite
sprite: _NF/Clothing/Back/Backpacks/arcadia-backpack.rsi
sprite: _NF/Clothing/Back/Backpacks/arcadia.rsi

- type: entity
parent: ClothingBackpack
Expand All @@ -14,4 +14,4 @@
description: A backpack for a True Ace.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Backpacks/pilot_backpack.rsi
sprite: _NF/Clothing/Back/Backpacks/pilot.rsi
8 changes: 4 additions & 4 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
name: mercenary duffel
description: A duffel that has been in many dangerous places, a reliable combat duffel.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/mercenary.rsi
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/mercenary.rsi

- type: entity
parent: ClothingBackpackDuffel
Expand All @@ -14,7 +14,7 @@
description: A duffelbag produced by Arcadia Industries
components:
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi
sprite: _NF/Clothing/Back/Duffels/arcadia.rsi

- type: entity
parent: ClothingBackpackDuffel
Expand All @@ -23,4 +23,4 @@
description: A duffelbag produced for a True Ace.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/pilot_duffel.rsi
sprite: _NF/Clothing/Back/Duffels/pilot.rsi
8 changes: 4 additions & 4 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
name: mercenary satchel
description: A satchel that has been in many dangerous places, a reliable combat satchel.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/mercenary.rsi
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/mercenary.rsi

- type: entity
parent: ClothingBackpackSatchel
Expand All @@ -14,7 +14,7 @@
description: A satchel produced by Arcadia Industries.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/arcadia-satchel.rsi
sprite: _NF/Clothing/Back/Satchels/arcadia.rsi

- type: entity
parent: ClothingBackpackSatchel
Expand All @@ -23,4 +23,4 @@
description: A satchel produced for a True Ace.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/pilot_satchel.rsi
sprite: _NF/Clothing/Back/Satchels/pilot.rsi
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A webbing created by Arcadia Industries. Seems very capable of fitting many items.
components:
- type: Sprite
sprite: _NF/Clothing/Belt/arcadia-webbing.rsi
sprite: _NF/Clothing/Belt/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Belt/arcadia-webbing.rsi
sprite: _NF/Clothing/Belt/arcadia.rsi

- type: entity
parent: ClothingBeltStorageBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
- EncryptionKeyCommon
- EncryptionKeyTraffic
- type: Sprite
sprite: _NF/Clothing/Ears/Headsets/pilot_headset.rsi
sprite: _NF/Clothing/Ears/Headsets/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Ears/Headsets/pilot_headset.rsi
sprite: _NF/Clothing/Ears/Headsets/pilot.rsi
10 changes: 5 additions & 5 deletions Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A visor produced by Arcadia Industries, with some high tech optics systems built in.
components:
- type: Sprite
sprite: _NF/Clothing/Eyes/Glasses/arcadiavisor.rsi
sprite: _NF/Clothing/Eyes/Glasses/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Eyes/Glasses/arcadiavisor.rsi
sprite: _NF/Clothing/Eyes/Glasses/arcadia.rsi
- type: FlashImmunity
- type: EyeProtection
- type: VisionCorrection
Expand All @@ -20,8 +20,8 @@
description: I'm sorry, but you can't pilot a ship without cool glasses. Those are the Rules. Has a GPS built in them too.
components:
- type: Sprite
sprite: _NF/Clothing/Eyes/Glasses/pilot_glasses.rsi
sprite: _NF/Clothing/Eyes/Glasses/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Eyes/Glasses/pilot_glasses.rsi
sprite: _NF/Clothing/Eyes/Glasses/pilot.rsi
- type: HandheldGPS
- type: VisionCorrection
- type: VisionCorrection
8 changes: 4 additions & 4 deletions Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: Combat gloves produced by Arcadia Industries.
components:
- type: Sprite
sprite: _NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi
sprite: _NF/Clothing/Hands/Gloves/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi
sprite: _NF/Clothing/Hands/Gloves/arcadia.rsi
- type: GloveHeatResistance
heatResistance: 1400
- type: Insulated
Expand All @@ -23,9 +23,9 @@
description: Driving gloves, but for spaceships!
components:
- type: Sprite
sprite: _NF/Clothing/Hands/Gloves/pilot_gloves.rsi
sprite: _NF/Clothing/Hands/Gloves/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Hands/Gloves/pilot_gloves.rsi
sprite: _NF/Clothing/Hands/Gloves/pilot.rsi
- type: GloveHeatResistance
heatResistance: 1400
- type: Fiber
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
description: Light hardsuit helmet for pilots.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hardsuits/pilot_helmet.rsi
sprite: _NF/Clothing/Head/Hardsuits/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hardsuits/pilot_helmet.rsi
sprite: _NF/Clothing/Head/Hardsuits/pilot.rsi
- type: PointLight
color: "#ffdbad"
- type: PressureProtection
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@
description: Can't hear voices in my headset when earflaps flaps over my ears. And it feels good.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/pilot_hat.rsi
sprite: _NF/Clothing/Head/Hats/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/pilot_hat.rsi
sprite: _NF/Clothing/Head/Hats/pilot.rsi
- type: Tag
tags:
- ClothMade
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
name: arcadia coat hood
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi
sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi
sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers.
components:
- type: Sprite
sprite: _NF/Clothing/Masks/arcadia-battleface.rsi
sprite: _NF/Clothing/Masks/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Masks/arcadia-battleface.rsi
sprite: _NF/Clothing/Masks/arcadia.rsi
- type: BreathMask
- type: IdentityBlocker
- type: Armor
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
description: Have I told you a story how I survived when the end of this scarf got tangled in a spinning propeller? I didn't, they cloned me.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Scarfs/pilot_scarf.rsi
sprite: _NF/Clothing/Neck/Scarfs/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Scarfs/pilot_scarf.rsi
sprite: _NF/Clothing/Neck/Scarfs/pilot.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
description: A hardsuit tailored for someone who spends the majority of their time buckled to a chair.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Hardsuits/pilot_hardsuit.rsi
sprite: _NF/Clothing/OuterClothing/Hardsuits/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Hardsuits/pilot_hardsuit.rsi
sprite: _NF/Clothing/OuterClothing/Hardsuits/pilot.rsi
- type: PressureProtection
highPressureMultiplier: 0.7
lowPressureMultiplier: 1000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A coat produced by Arcadia Industries, seems soft.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi
sprite: _NF/Clothing/OuterClothing/WinterCoats/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi
sprite: _NF/Clothing/OuterClothing/WinterCoats/arcadia.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodArcadia
- type: Armor
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description: Stylish boots for running in circles on a deck during emergencies.
components:
- type: Sprite
sprite: _NF/Clothing/Shoes/Boots/pilot_boots.rsi
sprite: _NF/Clothing/Shoes/Boots/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Shoes/Boots/pilot_boots.rsi
sprite: _NF/Clothing/Shoes/Boots/pilot.rsi
- type: Matchbox
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A jumpskirt produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi
sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi
sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia.rsi

- type: entity
parent: ClothingUniformSkirtBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
description: A jumpsuit produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia.rsi

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -61,6 +61,6 @@
description: You too think there should be a pocket for your fav smokes?
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/pilot_jumpsuit.rsi
sprite: _NF/Clothing/Uniforms/Jumpsuit/pilot.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/pilot_jumpsuit.rsi
sprite: _NF/Clothing/Uniforms/Jumpsuit/pilot.rsi
48 changes: 24 additions & 24 deletions Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
id: SpawnMobArcIndShredder
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: icon
sprite: _NF/Mobs/ArcadiaIndustries/arcind-shredder.rsi
- type: ConditionalSpawner
prototypes:
- MobArcIndShredder
- type: Sprite
layers:
- state: green
- state: icon
sprite: _NF/Mobs/ArcadiaIndustries/arcind_shredder.rsi
- type: ConditionalSpawner
prototypes:
- MobArcIndShredder

- type: entity
name: Arcadia Industries Guardian Spawner
id: SpawnMobArcIndHoloparasiteGuardian
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: icon
sprite: _NF/Mobs/ArcadiaIndustries/arcind-guardians.rsi
- type: ConditionalSpawner
prototypes:
- MobArcIndHoloparasiteGuardian
- type: Sprite
layers:
- state: green
- state: icon
sprite: _NF/Mobs/ArcadiaIndustries/arcind_guardians.rsi
- type: ConditionalSpawner
prototypes:
- MobArcIndHoloparasiteGuardian

- type: entity
name: Arcadia Industries Blaster Spawner
id: SpawnMobArcIndBlaster
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: icon
sprite: _NF/Mobs/ArcadiaIndustries/arcind-blasters.rsi
- type: ConditionalSpawner
prototypes:
- MobArcIndBlaster
- type: Sprite
layers:
- state: green
- state: icon
sprite: _NF/Mobs/ArcadiaIndustries/arcind_blasters.rsi
- type: ConditionalSpawner
prototypes:
- MobArcIndBlaster
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- SimpleHostile
- type: Sprite
drawdepth: Mobs
sprite: _NF/Mobs/ArcadiaIndustries/arcind-shredder.rsi
sprite: _NF/Mobs/ArcadiaIndustries/arcind_shredder.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: alive
Expand Down Expand Up @@ -69,7 +69,7 @@
components:
- type: Sprite
drawdepth: Mobs
sprite: _NF/Mobs/ArcadiaIndustries/arcind-guardians.rsi
sprite: _NF/Mobs/ArcadiaIndustries/arcind_guardians.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
Expand Down Expand Up @@ -122,7 +122,7 @@
task: SimpleRangedHostileCompound
- type: Sprite
drawdepth: Mobs
sprite: _NF/Mobs/ArcadiaIndustries/arcind-blasters.rsi
sprite: _NF/Mobs/ArcadiaIndustries/arcind_blasters.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
Expand Down
Empty file.

0 comments on commit dbc7121

Please sign in to comment.