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

Add kobold spawn marker, migrate prototypes to _Impstation and _Wizden folders #1355

Merged
merged 2 commits into from
Jan 14, 2025
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
63 changes: 7 additions & 56 deletions Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@
prototypes:
- MobCorgiMouse

- type: entity
name: Finfin Spawner
id: SpawnMobFinfin
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobFinfin

- type: entity
name: Possum Morty Spawner
id: SpawnMobPossumMorty
Expand All @@ -88,32 +75,6 @@
prototypes:
- MobPossumMortyOld

- type: entity
name: Poppy Spawner
id: SpawnMobPoppy
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobPossumPoppy

- type: entity
name: Goji Spawner
id: SpawnMobGoji
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobGoji

- type: entity
name: Raccoon Morticia Spawner
id: SpawnMobRaccoonMorticia
Expand All @@ -127,20 +88,6 @@
prototypes:
- MobRaccoonMorticia

- type: entity
name: Drone Spawner
id: SpawnMobDrone
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- sprite: Mobs/Silicon/drone.rsi
state: shell
- type: ConditionalSpawner
prototypes:
- Drone

- type: entity
name: Fox Renault Spawner
id: SpawnMobFoxRenault
Expand All @@ -157,6 +104,7 @@
- type: entity
name: Runtime Spawner
id: SpawnMobCatRuntime
#suffix imp edit
suffix: CMO's pet, steal target
parent: MarkerBase
components:
Expand All @@ -171,6 +119,7 @@
- type: entity
name: Exception Spawner
id: SpawnMobCatException
#suffix imp edit
suffix: CMO's pet, steal target
parent: MarkerBase
components:
Expand Down Expand Up @@ -198,6 +147,7 @@
- type: entity
name: Floppa Spawner
id: SpawnMobCatFloppa
#suffix imp edit
suffix: CMO's pet, steal target
parent: MarkerBase
components:
Expand All @@ -212,6 +162,7 @@
- type: entity
name: Bingus Spawner
id: SpawnMobCatBingus
#suffix imp edit
suffix: CMO's pet, steal target
parent: MarkerBase
components:
Expand Down Expand Up @@ -252,6 +203,7 @@
- type: entity
name: Cat Spawner
id: SpawnMobCat
#suffix imp edit
suffix: CMO's pet, steal target
parent: MarkerBase
components:
Expand All @@ -267,7 +219,7 @@
- MobBingus
- MobPipi
rarePrototypes:
- MobFinfin
- MobFinfin #imp edit
rareChance: 0.05

- type: entity
Expand All @@ -287,7 +239,7 @@
- MobCatKitten
rarePrototypes:
- MobCatSpace
- MobFinfin
- MobFinfin #imp edit
rareChance: 0.05

- type: entity
Expand Down Expand Up @@ -986,4 +938,3 @@
- type: ConditionalSpawner
prototypes:
- MobReindeerDoe

54 changes: 54 additions & 0 deletions Resources/Prototypes/_Impstation/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
- type: entity
name: Finfin Spawner
id: SpawnMobFinfin
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobFinfin

- type: entity
name: Poppy Spawner
id: SpawnMobPoppy
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobPossumPoppy

- type: entity
name: Goji Spawner
id: SpawnMobGoji
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobGoji

- type: entity
name: Kobold Spawner
id: SpawnMobKobold
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: kobold
sprite: Mobs/Animals/kobold.rsi
- state: outline
sprite: Mobs/Animals/kobold.rsi
- type: ConditionalSpawner
prototypes:
- MobKobold
13 changes: 13 additions & 0 deletions Resources/Prototypes/_Wizden/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
name: Drone Spawner
id: SpawnMobDrone
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- sprite: Mobs/Silicon/drone.rsi
state: shell
- type: ConditionalSpawner
prototypes:
- Drone
Loading