tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dev mouse acorgillation (#32040)

Browse Source 
* Update dev_map.yml

* real mouse returned
This commit is contained in:
Ed
2024-09-14 19:21:33 +03:00
committed by GitHub
parent 98ca7c8529
commit 00650f16ec
6 changed files with 71 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Maps/Test/dev_map.yml
View File

@@ -5070,7 +5070,7 @@ entities:
- type: Transform - type: Transform
pos: 3.5,7.5 pos: 3.5,7.5
parent: 179 parent: 179
- proto: SpawnMobMouse - proto: SpawnMobCorgiMouse
entities: entities:
- uid: 1050 - uid: 1050
components: components:

14
Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
View File

@@ -48,6 +48,20 @@
- MobCorgiLisa - MobCorgiLisa
- MobCorgiIanPup - MobCorgiIanPup
- type: entity
name: Dev Mouse Spawner
id: SpawnMobCorgiMouse
suffix: Admeme
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobCorgiMouse
- type: entity - type: entity
name: Possum Morty Spawner name: Possum Morty Spawner
id: SpawnMobPossumMorty id: SpawnMobPossumMorty

23
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
View File

@@ -85,6 +85,29 @@
proper: true proper: true
gender: female gender: female
- type: entity
name: real mouse
parent: MobCorgiIan
id: MobCorgiMouse
description: It's 100% a real hungry mouse.
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: real_mouse
- type: DamageStateVisuals
states:
Alive:
Base: real_mouse
Critical:
Base: real_mouse_dead
Dead:
Base: real_mouse_dead
- type: Grammar
attributes:
proper: true
gender: female
- type: entity - type: entity
name: Puppy Ian name: Puppy Ian
parent: MobCorgiPuppy parent: MobCorgiPuppy

292
Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
View File

@@ -5,207 +5,60 @@
"y": 32 "y": 32
}, },
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh", "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd",
"states": [ "states": [
{ {
"name": "corgi", "name": "corgi",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "corgi_rest", "name": "corgi_rest",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "corgi_dead", "name": "corgi_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "ian", "name": "ian",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "ian_dead", "name": "ian_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "corgi_deadcollar", "name": "corgi_deadcollar"
"delays": [
[
1
]
]
}, },
{ {
"name": "corgi_deadtag", "name": "corgi_deadtag"
"delays": [
[
1
]
]
}, },
{ {
"name": "ian_shaved", "name": "ian_shaved",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "ian_shaved_dead", "name": "ian_shaved_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "corgicollar", "name": "corgicollar",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "corgitag", "name": "corgitag",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "lisa", "name": "lisa",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "lisa_dead", "name": "lisa_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "lisa_shaved", "name": "lisa_shaved",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "lisa_shaved_dead", "name": "lisa_shaved_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "narsian", "name": "narsian",
@@ -238,12 +91,7 @@
] ]
}, },
{ {
"name": "old_ian_dead", "name": "old_ian_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "old_ian_shaved", "name": "old_ian_shaved",
@@ -268,116 +116,42 @@
] ]
}, },
{ {
"name": "old_ian_shaved_dead", "name": "old_ian_shaved_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "puppy", "name": "puppy",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "puppy_dead", "name": "puppy_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "puppy_deadcollar", "name": "puppy_deadcollar"
"delays": [
[
1
]
]
}, },
{ {
"name": "puppy_deadtag", "name": "puppy_deadtag"
"delays": [
[
1
]
]
}, },
{ {
"name": "puppy_shaved", "name": "puppy_shaved",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "puppy_shaved_dead", "name": "puppy_shaved_dead"
"delays": [
[
1
]
]
}, },
{ {
"name": "puppycollar", "name": "puppycollar",
"directions": 4, "directions": 4
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}, },
{ {
"name": "puppytag", "name": "puppytag",
"directions": 4, "directions": 4
"delays": [ },
[ {
1 "name": "real_mouse",
], "directions": 4
[ },
1 {
], "name": "real_mouse_dead"
[
1
],
[
1
]
]
} }
] ]
} }

BIN
Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 733 B