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

Remove some SS14 Decals, Add white decal, give Vault Security PDA, Fix Psycho Boss Spawner, Add TImed Psycho Spawners, Gave vault more slots #478

Merged
merged 17 commits into from
Aug 30, 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
92 changes: 0 additions & 92 deletions Resources/Prototypes/Decals/originsign.yml

This file was deleted.

50 changes: 0 additions & 50 deletions Resources/Prototypes/Decals/ss14sign.yml

This file was deleted.

132 changes: 0 additions & 132 deletions Resources/Prototypes/Decals/syndlogo.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Resources/Prototypes/Maps/N14/sunnyvale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
BoSMidScribe: [ 1, 2 ]
BoSMidSquire: [ 2, 2 ]
Overseer: [ 1, 1 ]
VaultDoctor: [ 1, 1 ]
VaultDweller: [ 3, 3 ]
VaultDoctor: [ 2, 2 ]
VaultDweller: [ 4, 4 ]
VaultEngineer: [ 1, 1 ]
VaultSecurity: [ 1, 1 ]
VaultSecurity: [ 2, 2 ]
15 changes: 15 additions & 0 deletions Resources/Prototypes/_Nuclear14/Decals/fullwhite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: decal
id: N14FullTile
tags: ["Full Tile"]
snapCardinals: true
sprite:
sprite: _Nuclear14/Decals/FullWhite.rsi
state: full_tile

- type: decal
id: N14HalfTile
tags: ["Half Tile"]
snapCardinals: true
sprite:
sprite: _Nuclear14/Decals/FullWhite.rsi
state: half_tile
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,64 @@
chance: 0.95
intervalSeconds: 2400
minimumEntitiesSpawned: 1
maximumEntitiesSpawned: 3
maximumEntitiesSpawned: 3

- type: entity
name: Raider Ranged Psycho Timed Spawner
id: N14TimedSpawnerMobRaiderPsychoRanged
parent: N14TimedSpawnerMolerat
components:
- type: Sprite
layers:
- state: blue
- sprite: _Nuclear14/Mobs/RaidersSimpleMob/Raiders.rsi
state: raider_ranged
- state: timed
- type: Timer
- type: TimedSpawner
prototypes:
- N14MobRaiderPsychoRanged
chance: 0.95
intervalSeconds: 2400
minimumEntitiesSpawned: 1
maximumEntitiesSpawned: 2

- type: entity
name: Raider Psycho Boss Timed Spawner
id: N14TimedSpawnerMobRaiderBoss
parent: N14TimedSpawnerMolerat
components:
- type: Sprite
layers:
- state: blue
- sprite: _Nuclear14/Mobs/RaidersSimpleMob/Raiders.rsi
state: raiderboss
- state: timed
- type: Timer
- type: TimedSpawner
prototypes:
- N14MobRaiderBoss
chance: 0.95
intervalSeconds: 2400
minimumEntitiesSpawned: 1
maximumEntitiesSpawned: 1

- type: entity
name: Raider Psycho Timed Spawner
id: N14TimedSpawnerMobRaiderPsycho
parent: N14TimedSpawnerMolerat
components:
- type: Sprite
layers:
- state: blue
- sprite: _Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi
state: raider_melee
- state: timed
- type: Timer
- type: TimedSpawner
prototypes:
- N14MobRaiderPsycho
chance: 0.95
intervalSeconds: 2400
minimumEntitiesSpawned: 1
maximumEntitiesSpawned: 3
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
- state: ai
- type: ConditionalSpawner
prototypes:
- N14MobRaiderPsycho
- N14MobRaiderBoss

- type: entity
name: Raider Psycho Spawner
Expand Down
Loading
Loading