Skip to content

Commit

Permalink
Rats eyes glow in dark + reorganize rat textures (#26300)
Browse files Browse the repository at this point in the history
* Split mice from rats and made rats eye glow

+ added red eyes to regal rats (Both king and buff) + normal rats
- removed mouse-3 sprites from mice and moved it into a dedicated rat rsi
+fixed admin smite wording (you turn players into mice, not rats)

* minor formatting fix

* removed version numbers float.

* Typo fix + removed unneeded layer name
  • Loading branch information
jamessimo authored Mar 21, 2024
1 parent f4cb02f commit 12f94b3
Show file tree
Hide file tree
Showing 16 changed files with 147 additions and 86 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/administration/smites.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ admin-smite-reptilian-species-swap-description = It changes their species to Rep
admin-smite-locker-stuff-description = Stuffs them in a (welded) locker.
admin-smite-headstand-description = Vertically flips their sprite.
admin-smite-plasma-internals-description = Replaces the contents of their internals with plasma.
admin-smite-become-mouse-description = They become a rat. Ratatouille.
admin-smite-become-mouse-description = They become a mouse. Squeak!
admin-smite-maid-description = Forcibly converts them into a janitorial cat maid. This is actual torture for some players, use it wisely.
admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings.
admin-smite-flip-eye-description = Flips their view, effectively reversing their controls and making the game annoying to play.
Expand Down
26 changes: 19 additions & 7 deletions Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: regalrat
- map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
state: eyes
shader: unshaded
- type: Physics
bodyType: KinematicController
- type: Fixtures
Expand Down Expand Up @@ -77,6 +80,7 @@
states:
Alive:
Base: regalrat
BaseUnshaded: eyes
Critical:
Base: critical
Dead:
Expand Down Expand Up @@ -126,6 +130,9 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: regalrat
- map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
state: eyes
shader: unshaded
- type: MobState
- type: MobThresholds
thresholds:
Expand Down Expand Up @@ -180,17 +187,21 @@
- SimpleHostile
- type: Sprite
drawdepth: SmallMobs
sprite: Mobs/Animals/mouse.rsi
sprite: Mobs/Animals/rat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base", "movement"]
state: mouse-3
state: rat
- map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
state: eyes
shader: unshaded

- type: SpriteMovement
movementLayers:
movement:
state: mouse-moving-3
state: rat-moving
noMovementLayers:
movement:
state: mouse-3
state: rat
- type: Physics
bodyType: KinematicController
- type: Fixtures
Expand Down Expand Up @@ -243,11 +254,12 @@
- type: DamageStateVisuals
states:
Alive:
Base: mouse-3
Base: rat
BaseUnshaded: eyes
Critical:
Base: dead-3
Base: dead
Dead:
Base: splat-3
Base: splat
- type: Butcherable
spawned:
- id: FoodMeatRat
Expand Down
Binary file added Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 22 additions & 18 deletions Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-NC-SA-4.0",
"copyright": "Created by RamZ",
"states": [
{
"name": "dead"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "icon"
},
{
"name": "regalrat",
"directions": 4
}
]
"license": "CC-BY-NC-SA-4.0",
"copyright": "Created by RamZ + eyes added by jamessimo",
"states": [
{
"name": "dead"
},
{
"name": "icon"
},
{
"name": "regalrat",
"directions": 4
},
{
"name": "eyes",
"directions": 4
}
]
}
39 changes: 0 additions & 39 deletions Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
{
"name": "icon-2"
},
{
"name": "icon-3"
},
{
"name": "mouse-0",
"directions": 4
Expand Down Expand Up @@ -109,36 +106,6 @@
]
]
},
{
"name": "mouse-3",
"directions": 4
},
{
"name": "mouse-moving-3",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
},
{
"name": "dead-0"
},
Expand All @@ -148,9 +115,6 @@
{
"name": "dead-2"
},
{
"name": "dead-3"
},
{
"name": "splat-0"
},
Expand All @@ -160,9 +124,6 @@
{
"name": "splat-2"
},
{
"name": "splat-3"
},
{
"name": "0-equipped-HELMET",
"directions": 4
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Mobs/Animals/rat.rsi/eyes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
80 changes: 80 additions & 0 deletions Resources/Textures/Mobs/Animals/rat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298 eyes added by jamessimo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "rat",
"directions": 4
},
{
"name": "eyes",
"directions": 4
},
{
"name": "rat-moving",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
},
{
"name": "eyes-moving",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
},
{
"name": "dead"
},
{
"name": "splat"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 25 additions & 21 deletions Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh",
"states": [
{
"name": "critical"
"version": 1,
"size": {
"x": 32,
"y": 32
},
{
"name": "dead"
},
{
"name": "icon"
},
{
"name": "regalrat",
"directions": 4
}
]
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh + eyes added by jamessimo",
"states": [
{
"name": "critical"
},
{
"name": "dead"
},
{
"name": "icon"
},
{
"name": "regalrat",
"directions": 4
},
{
"name": "eyes",
"directions": 4
}
]
}

0 comments on commit 12f94b3

Please sign in to comment.