diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 0fc44e8cfd..318653bf36 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -39,7 +39,7 @@ visuals: - type: DamageStateVisualizer normal: alive - crit: dead + crit: crit dead: dead - type: entity diff --git a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/crit.png new file mode 100644 index 0000000000..2a00379baf Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/dead.png index 9d40430296..6dabffd0b5 100644 Binary files a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/dead.png and b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json index 36580a0a8c..52da404bc3 100644 --- a/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json +++ b/Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json @@ -5,21 +5,52 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/b143783881fb7418213026857cb8c569636e259e#diff-8dd94e19fdb2ff341b57e31bce101298", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/b143783881fb7418213026857cb8c569636e259e#diff-8dd94e19fdb2ff341b57e31bce101298, edited 'alive' to create 'crit' and 'dead' states", "states": [ { - "name": "icon", - "delays": [ - [ - 1 - ] - ] + "name": "icon" }, { "name": "dead", "delays": [ [ - 1 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "crit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, diff --git a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/crit.png new file mode 100644 index 0000000000..ed5b23705a Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/dead.png index f42607ccdd..807ffb4c91 100644 Binary files a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/dead.png and b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json index 7a30227273..c35dd71e41 100644 --- a/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json +++ b/Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json @@ -5,23 +5,16 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/commit/d3d351dea8d9420cee47514843a02158d0a7266f#diff-8dd94e19fdb2ff341b57e31bce101298", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/d3d351dea8d9420cee47514843a02158d0a7266f#diff-8dd94e19fdb2ff341b57e31bce101298, edited 'dead' to create 'crit' and 'dead' states", "states": [ { - "name": "icon", - "delays": [ - [ - 1 - ] - ] + "name": "icon" }, { - "name": "dead", - "delays": [ - [ - 1 - ] - ] + "name": "dead" + }, + { + "name": "crit" }, { "name": "alive", diff --git a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/crit.png new file mode 100644 index 0000000000..1492ef26f2 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/dead.png index 610087d8f2..87cdf63757 100644 Binary files a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/dead.png and b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json index 0e75d0f662..a45b246fc8 100644 --- a/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json +++ b/Resources/Textures/Mobs/Aliens/Carps/space.rsi/meta.json @@ -5,23 +5,16 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/animal.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/animal.dmi, edited 'dead' to create 'crit' and 'dead' states", "states": [ { - "name": "icon", - "delays": [ - [ - 1 - ] - ] + "name": "icon" }, { - "name": "dead", - "delays": [ - [ - 1 - ] - ] + "name": "dead" + }, + { + "name": "crit" }, { "name": "alive",