Remove some SS14 Decals, Add white decal, give Vault Security PDA, Fi…

…x Psycho Boss Spawner, Add TImed Psycho Spawners, Gave vault more slots (Vault-Overseers#478)
MutantMan2040 · Aug 30, 2024 · 051755c · 051755c
1 parent 71c9aa0
commit 051755c
Show file tree

Hide file tree

Showing 54 changed files with 113 additions and 430 deletions.
diff --git a/Resources/Prototypes/Decals/originsign.yml b/Resources/Prototypes/Decals/originsign.yml
diff --git a/Resources/Prototypes/Decals/ss14sign.yml b/Resources/Prototypes/Decals/ss14sign.yml
diff --git a/Resources/Prototypes/Decals/syndlogo.yml b/Resources/Prototypes/Decals/syndlogo.yml
diff --git a/Resources/Prototypes/Maps/N14/sunnyvale.yml b/Resources/Prototypes/Maps/N14/sunnyvale.yml
@@ -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 ]
diff --git a/Resources/Prototypes/_Nuclear14/Decals/fullwhite.yml b/Resources/Prototypes/_Nuclear14/Decals/fullwhite.yml
@@ -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
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml
@@ -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
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml
@@ -330,7 +330,7 @@
       - state: ai
   - type: ConditionalSpawner
     prototypes:
-      - N14MobRaiderPsycho
+      - N14MobRaiderBoss
 
 - type: entity
   name: Raider Psycho Spawner