From f5ac9de4d351c62644858d5796779bba632d9f2b Mon Sep 17 00:00:00 2001
From: RumiTiger <t.badredinov@gmail.com>
Date: Sun, 26 Jan 2025 15:11:36 -0300
Subject: [PATCH 1/4] remy

---
 Resources/Maps/Adventure/Adventureamber.yml   |  23 +++++-
 Resources/Maps/Adventure/Adventureaspid.yml   |  23 +++---
 Resources/Maps/Adventure/Adventurebagel.yml   |   7 ++
 Resources/Maps/Adventure/Adventurecluster.yml |  21 +++++-
 Resources/Maps/Adventure/Adventuredelta.yml   |   7 ++
 Resources/Maps/Adventure/Adventureloop.yml    |  29 ++++++--
 .../Maps/Adventure/Adventuremarathon.yml      |  23 +++++-
 .../Adventure/Roles/Animals/remy.yml          |  66 ++++++++++++++++++
 .../Adventure/Roles/remy.rsi/dead.png         | Bin 0 -> 452 bytes
 .../Roles/remy.rsi/equipped-HELMET.png        | Bin 0 -> 554 bytes
 .../Adventure/Roles/remy.rsi/icon.png         | Bin 0 -> 455 bytes
 .../Adventure/Roles/remy.rsi/inhand-left.png  | Bin 0 -> 377 bytes
 .../Adventure/Roles/remy.rsi/inhand-right.png | Bin 0 -> 385 bytes
 .../Adventure/Roles/remy.rsi/meta.json        |  62 ++++++++++++++++
 .../Adventure/Roles/remy.rsi/mouse-moving.png | Bin 0 -> 1721 bytes
 .../Adventure/Roles/remy.rsi/mouse.png        | Bin 0 -> 1208 bytes
 .../Adventure/Roles/remy.rsi/splat.png        | Bin 0 -> 545 bytes
 17 files changed, 243 insertions(+), 18 deletions(-)
 create mode 100644 Resources/Prototypes/Adventure/Roles/Animals/remy.yml
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/dead.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/icon.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/meta.json
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/mouse-moving.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/mouse.png
 create mode 100644 Resources/Textures/Adventure/Roles/remy.rsi/splat.png

diff --git a/Resources/Maps/Adventure/Adventureamber.yml b/Resources/Maps/Adventure/Adventureamber.yml
index c8a52af285..e915857d49 100644
--- a/Resources/Maps/Adventure/Adventureamber.yml
+++ b/Resources/Maps/Adventure/Adventureamber.yml
@@ -53,7 +53,7 @@ entities:
       name: grid
     - type: Transform
       pos: 0.53697205,0.547603
-      parent: invalid
+      parent: 20475
     - type: BecomesStation
       id: AdvAmber
     - type: MapGrid
@@ -11669,6 +11669,18 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: NavMap
+  - uid: 20475
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: ActionToggleInternals
   entities:
   - uid: 3027
@@ -65616,7 +65628,7 @@ entities:
       pos: -16.5,-17.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -33671.855
+      secondsUntilStateChange: -33734.582
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -110244,6 +110256,13 @@ entities:
     - type: Transform
       pos: 30.5,-55.5
       parent: 2
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 20476
+    components:
+    - type: Transform
+      pos: -6.5,-32.5
+      parent: 2
 - proto: SpawnMobParrot
   entities:
   - uid: 16167
diff --git a/Resources/Maps/Adventure/Adventureaspid.yml b/Resources/Maps/Adventure/Adventureaspid.yml
index b2b6fd0c47..eb53a1fb58 100644
--- a/Resources/Maps/Adventure/Adventureaspid.yml
+++ b/Resources/Maps/Adventure/Adventureaspid.yml
@@ -11234,7 +11234,7 @@ entities:
       pos: 12.5,-19.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -100025.51
+      secondsUntilStateChange: -100084.57
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -12168,7 +12168,7 @@ entities:
       pos: 28.5,10.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1185.4613
+      secondsUntilStateChange: -1244.527
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -12743,7 +12743,7 @@ entities:
       pos: -29.5,48.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -49759.195
+      secondsUntilStateChange: -49818.26
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -59292,7 +59292,7 @@ entities:
       pos: 2.5,16.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -96985.64
+      secondsUntilStateChange: -97044.7
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 184.2664844
@@ -59302,7 +59302,7 @@ entities:
       pos: 3.5,16.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -80314.25
+      secondsUntilStateChange: -80373.31
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 184.6998173
@@ -59372,7 +59372,7 @@ entities:
       pos: -31.5,16.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -24989.945
+      secondsUntilStateChange: -25049.012
       state: Closing
   - uid: 5679
     components:
@@ -59816,7 +59816,7 @@ entities:
       pos: -30.5,-6.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -54289.59
+      secondsUntilStateChange: -54348.656
       state: Closing
   - uid: 5809
     components:
@@ -60465,7 +60465,7 @@ entities:
       pos: -11.5,37.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -93658.41
+      secondsUntilStateChange: -93717.47
       state: Closing
   - uid: 9591
     components:
@@ -103454,6 +103454,13 @@ entities:
     - type: Transform
       pos: -42.5,9.5
       parent: 1
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 18711
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
 - proto: SpawnMobParrot
   entities:
   - uid: 3171
diff --git a/Resources/Maps/Adventure/Adventurebagel.yml b/Resources/Maps/Adventure/Adventurebagel.yml
index 3ba59911ac..1f81f9cfa6 100644
--- a/Resources/Maps/Adventure/Adventurebagel.yml
+++ b/Resources/Maps/Adventure/Adventurebagel.yml
@@ -131628,6 +131628,13 @@ entities:
     - type: Transform
       pos: 29.5,15.5
       parent: 2
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 25297
+    components:
+    - type: Transform
+      pos: 26.5,-34.5
+      parent: 2
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 20088
diff --git a/Resources/Maps/Adventure/Adventurecluster.yml b/Resources/Maps/Adventure/Adventurecluster.yml
index 117e6eed14..8889291bae 100644
--- a/Resources/Maps/Adventure/Adventurecluster.yml
+++ b/Resources/Maps/Adventure/Adventurecluster.yml
@@ -50,7 +50,7 @@ entities:
     - type: MetaData
     - type: Transform
       pos: -0.484375,-0.5
-      parent: invalid
+      parent: 12679
     - type: MapGrid
       chunks:
         0,0:
@@ -4699,6 +4699,18 @@ entities:
       id: advCluster
     - type: SpreaderGrid
     - type: GridPathfinding
+  - uid: 12679
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 5973
@@ -67323,6 +67335,13 @@ entities:
     - type: Transform
       pos: -24.5,-17.5
       parent: 1
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 12680
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 11926
diff --git a/Resources/Maps/Adventure/Adventuredelta.yml b/Resources/Maps/Adventure/Adventuredelta.yml
index 45677de1db..bf8203b550 100644
--- a/Resources/Maps/Adventure/Adventuredelta.yml
+++ b/Resources/Maps/Adventure/Adventuredelta.yml
@@ -230541,6 +230541,13 @@ entities:
     - type: Transform
       pos: 15.5,72.5
       parent: 2
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 40915
+    components:
+    - type: Transform
+      pos: -31.5,35.5
+      parent: 2
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 29993
diff --git a/Resources/Maps/Adventure/Adventureloop.yml b/Resources/Maps/Adventure/Adventureloop.yml
index 497a3affa9..2cd274fd4f 100644
--- a/Resources/Maps/Adventure/Adventureloop.yml
+++ b/Resources/Maps/Adventure/Adventureloop.yml
@@ -41,7 +41,7 @@ entities:
       name: grid
     - type: Transform
       pos: 5.375742,-1.5783513
-      parent: invalid
+      parent: 13915
     - type: MapGrid
       chunks:
         0,0:
@@ -4362,6 +4362,18 @@ entities:
     - type: NavMap
     - type: BecomesStation
       id: advLoop
+  - uid: 13915
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 2659
@@ -40645,7 +40657,7 @@ entities:
       pos: -9.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234886.7
+      secondsUntilStateChange: -234935.27
       state: Opening
   - uid: 6747
     components:
@@ -40653,7 +40665,7 @@ entities:
       pos: -8.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234887.4
+      secondsUntilStateChange: -234935.97
       state: Opening
   - uid: 6749
     components:
@@ -40661,7 +40673,7 @@ entities:
       pos: -6.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234885.97
+      secondsUntilStateChange: -234934.53
       state: Opening
   - uid: 6750
     components:
@@ -40669,7 +40681,7 @@ entities:
       pos: -5.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234885.34
+      secondsUntilStateChange: -234933.9
       state: Opening
 - proto: CyberPen
   entities:
@@ -86570,6 +86582,13 @@ entities:
     - type: Transform
       pos: -62.5,48.5
       parent: 2
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 13916
+    components:
+    - type: Transform
+      pos: -49.5,48.5
+      parent: 2
 - proto: SpawnMobParrot
   entities:
   - uid: 6325
diff --git a/Resources/Maps/Adventure/Adventuremarathon.yml b/Resources/Maps/Adventure/Adventuremarathon.yml
index 99e2a67f24..259c57d0a7 100644
--- a/Resources/Maps/Adventure/Adventuremarathon.yml
+++ b/Resources/Maps/Adventure/Adventuremarathon.yml
@@ -70,7 +70,7 @@ entities:
     - type: MetaData
     - type: Transform
       pos: 2.2710133,-2.4148211
-      parent: invalid
+      parent: 22632
     - type: MapGrid
       chunks:
         -1,0:
@@ -7598,6 +7598,18 @@ entities:
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: NavMap
+  - uid: 22632
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 525
@@ -10836,7 +10848,7 @@ entities:
       pos: -14.5,24.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -2201.6243
+      secondsUntilStateChange: -2251.1458
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -117423,6 +117435,13 @@ entities:
     - type: Transform
       pos: 33.5,4.5
       parent: 30
+- proto: SpawnMobMouseRemy
+  entities:
+  - uid: 22633
+    components:
+    - type: Transform
+      pos: -15.5,10.5
+      parent: 30
 - proto: SpawnMobParrot
   entities:
   - uid: 22525
diff --git a/Resources/Prototypes/Adventure/Roles/Animals/remy.yml b/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
new file mode 100644
index 0000000000..762a81d9e5
--- /dev/null
+++ b/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
@@ -0,0 +1,66 @@
+- type: entity
+  name: Реми
+  description: Питомец шеф-повара, маленький серый поварёнок, который мастерски балансирует между готовкой и уничтожением запасов кухни.
+  parent: MobMouse
+  suffix: Adventure
+  id: MobMouseRemy
+  components:
+  - type: Sprite
+    drawdepth: SmallMobs
+    sprite: Adventure\Roles\remy.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
+      state: mouse
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: mouse-moving
+    noMovementLayers:
+      movement:
+        state: mouse
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: Реми, питомец шеф-повара
+    description: Слушайтесь шеф-повара и вдохновляйте его на шедевры. Боритесь с желанием слопать всё, что лежит на кухне, доказывая, что вы — крыса с высокой кулинарной дисциплиной.
+    rules: ghost-role-information-familiar-rules
+    mindRoles:
+    - MindRoleGhostRoleFamiliar
+  - type: GhostTakeoverAvailable
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.03"
+    sprite: Adventure\Roles\remy.rsi
+    equippedPrefix: 0
+    quickEquip: false
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      40: Critical
+      60: Dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mouse
+      Critical:
+        Base: dead
+      Dead:
+        Base: splat
+
+- type: entity
+  name: спавнер мышь Реми
+  id: SpawnMobMouseRemy
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: icon
+        sprite: Adventure\Roles\remy.rsi
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobMouseRemy
diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/dead.png b/Resources/Textures/Adventure/Roles/remy.rsi/dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e026e2a188204a141a0b796495a2599294f347
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$en~_@R9J=Wlf6sBKp2OgsGF;ULJS6KDw08hf*&Y?xH)vsBothfqKp552%;zy
zLFj045;}C~B9tyJQV<H#QV7IC1qD&uI-G-~Bx$v_U|sHkkh_C>e@`y&fkYyaNF@J^
z((6Xuw1j`|l!`so>S>d1S|S#Y2i7vFREvlw>6D5}xm*?i(P%V~*|k8s@UVzeDk{2Z
ziA-z}eSVqx<P4go0pPlBKw{vxq23b?zsnZ_^H@BNZd&5w?X@Mm9UV_VH!b0mib~eD
z#m(FjcliRfY6Uf70I;yW20)|H2<*$GQsl0$&@>I#b(`<5et{PbkhN{GbN_%EF_>Ll
z35bLxUY_cVjE*(y9Bgg24F?$NbOIh5>9hi%MhtOze8lsk;}sLPz{J!fW8+%jB+mA>
zNt`5^o?H6%mi*WQUNiaE_J;@k;iwUVTD3wheM$Y%ZQcfe#7PqP>We=kYumy<_JqBr
u-90@Q?-z$6{2_f2@{9CMKq8Syy5$qD;iN>pK&~+W0000<MNUMnLSTYp<;lqa

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/equipped-HELMET.png b/Resources/Textures/Adventure/Roles/remy.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..50b2136f502fa714702a9ef99736011467e1b33b
GIT binary patch
literal 554
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zpLn`BhE&XX
zdvmY%;Q$fV55j_?N|$_^CU;+mY+ut_7Vw`<)`f*VP>^-HU(;+yl?4kfIJ&d%?r7zc
z<=X1JP{ZTuQO`{xS{$L%pDSo8S?m!%`}OgkX=x{G+b5fxX06*;wtMZOb1$y#T^OQO
zx-Ry5=+&&NT~bcrW!3(?>h25-mtRMgUf*%_*rz?L3@bytvcsl(GAyrHGimE0riPTY
zE9N{Ze4@TE*}}4k@%X`4=k(ZQ*b^nydblJ?ge0PF9|_ynuyCs{j}_-*2DP-~m&5$?
z<*TZG7gSZW-2AxZV{}G{L$Xe?ZlxVV!pYAUB~BmtXI@cRcj)9nMz!V34K{B``oktA
z%D`a$)mz8Tq#$^|iLBtsBd)xb_ctGkzifHSeBXbLe=ZwqSpEx%DablVaZlh==w<a_
zpKy$63A0Bs<0Zx=8yQ|QT#9HYVaU{Ruxc>DqU`r1rkLx!rPhC@rb~$mq)Psb^)b#A
z2U@<UXkYr&=4o2&x>MK3Yu?@#$QQM7Y7k%4scpGWUWaR)nfTfE^b(f0Ooy6h9kkU-
zXJyFOE@F__Yxn<~&>`bP#@gwuCe6RkHD8>YzDKt1&i(Me#l_c-zur+(w(nipj1DC5
cVtxhd?lX(0ot^YW6&U#pp00i_>zopr01I#E!T<mO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/icon.png b/Resources/Textures/Adventure/Roles/remy.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6e13c7a1a949742f497776ed3b78cd6646a3e17
GIT binary patch
literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$fk{L`R9J=Wlg&y3Q5c3FrHv7omK1^FAm$Gv#uOPs-9Ro}wXGXy(LJ;cf*=Tl
zx&)UkY8x0Pg(Ch0%Gk~*glLwhMU5I3&T-SCdEjt{bI!c)d*=HFY;0`)JB~?Ttk>(p
ze2zpS6YETDZWu;?42O|LD!HO+0-#kXISj+-o4Q;s$MBwv=9G+iKAQ$03qsd*0)YU!
zu8-`=gs>FAG*C7+d9Rm$JhR}LWjc}|FB!seQlDQDSG(I>%*TH{v-eyjo4=7RgJpbv
zMJTE!4vtTS)9L&+E2<{UK7c{Lj6*u9qG}?(mSTA&(O+xam#G#DBR5x6ZEPu=vH{#)
zAJt+3fVssb0B)}@aeI9uL9LX+@?T(zCerJ)YfbXG91r_DgpSULuBHe^!}MOd;;r|}
zjN4<m52OMBv};X*(J%m^!-09b)&!v2X*s%`mSsJu0AIHf0JXc%GMMwzV`HN3m;M4L
x$ru2cPOEQrzLgdvV`M5NSveaU8ylOy=L6h}rbZ;YU%UVS002ovPDHLkV1nqj!m<DW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/inhand-left.png b/Resources/Textures/Adventure/Roles/remy.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d90041a05427a90e80db69ee5cb58be790abc8
GIT binary patch
literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zjXhl)Ln`LH
zy|v%#aDd41kMa6><$)SAn!3+5J$NU)Bc()h2UpU>v=<ZdBx9mvniRe;T0Ijya&zG&
z*I!I-0)IBAOuDV<?08|)?XZ{MH^&I+J&*C@i##_KXblk9XmlM~`-^A))`!M7l55^=
z+is@nS*c&9pa0&<<I=42GWAjSy5|}mQ$2h}GCAg6w|2SH=F6qiubZ#C`BHDm>Ynon
zj@B!;{#vQB@~Xe+mdU5$_sf|~;bmLJ-h1l#@4o9y9+y%~t{pu-S#9yg=@tCt-;H12
zx_Q_BkGXva#CjmPW@_qv-W9XX|1K!Gx=3SI_Wtio5!q9DHZLu4G&(b9YuU5A*U#OH
z*|}GI!5;Y!mDO7>C{6izx@PJ1Kb2dBpFY04d8r!z;euyBHEarnl1o9M+92=4Sdtt)
TJ*9tL3dj~uS3j3^P6<r_FYl(z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/inhand-right.png b/Resources/Textures/Adventure/Roles/remy.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..56cee43445e43e3f843250195849ee919a69b8d8
GIT binary patch
literal 385
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ztvy{FLn`LH
zy|v%_u!G2fkJk_Db~_yuiFp+xu<N(@j+7G39b8Eh(_T!-lZ*+HX;S#Ye`1Ec;~ZJ7
z*d_lP1X=2JW<IfE<?-mb5woby-djQZ-QMc*nfE$@)&N0`l5cQqIbY~a4XHh!{l0v=
zwydK=rE$6Z{P>jf{LyYk*-a`Rwgh?o4qP)e$cl5%vH2|rD;AyC)BBoWqd9f8medya
zx@-$xSC<qE-lK9qd+-0<c6VZh+2n0^HNVy-GP<}-``kKb-@VgC`+gJ_sojaY|76~O
zzwOua|Kx-G4+ahK$G_}t)Ou8VQ|9l9(z~U{*WcaF^<m%U*|!-_Z#vSSq`dq<e^PGb
zwOh}1V;l0;ub)4u{m$+;?+)C)TDjEq#Iy5{B&Tnk^L_5&J5I944QCxcc(KrSZGP1|
cpxHmF!@{3NPd}I<c@$)mr>mdKI;Vst01Ah#UH||9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/meta.json b/Resources/Textures/Adventure/Roles/remy.rsi/meta.json
new file mode 100644
index 0000000000..7ab95bfdb0
--- /dev/null
+++ b/Resources/Textures/Adventure/Roles/remy.rsi/meta.json
@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from the original mouse sprite and modified by RumiTiger.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "mouse",
+      "directions": 4
+    },
+    {
+      "name": "mouse-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"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/mouse-moving.png b/Resources/Textures/Adventure/Roles/remy.rsi/mouse-moving.png
new file mode 100644
index 0000000000000000000000000000000000000000..7aa5d589e2d03bcdfaa4ca117a32e1dea32b9935
GIT binary patch
literal 1721
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
AfdBvi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/mouse.png b/Resources/Textures/Adventure/Roles/remy.rsi/mouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b52bbd78525049da7a73f72b5b4ad0ec8b9dba
GIT binary patch
literal 1208
zcmV;p1V{UcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(a!Eu%RCt{2nqNp;R~W#5S?5DmSr%uQ8zy+EnkW%R?5em~2HQiSKICP6iLe%Y
zDYOh)ilr}Ou!ll%P#koFz&6mA?IjPE`7oih+o+w2qDZ2HNE|2_8ZyH2kcYE}^xWM<
zo%dXmmbT{yAvgEjeE;q_-?`lH1C2(b(Y(C4p0xo-A(cuAc^nJ|pKD)~Nu^SvSS*?!
zYcN!B9JOZ^eIpzZ0O{35SFu<$ZE(BYF6)?Gd9OM#B9%&sKp;@@`)LHh2uDP8bQFNe
z@mnI3$q)zx$Ye4VV~KcN*bTxfss<S0$R1~d!JtcysmN2+-F>p3^`#X6LVf)e<E`zT
z0AzQzX>ISs=QnKGVtWP{;fP2?2LXt}p6FZ0RHmR^p2#$V&=%_8o1bUR@wQM0*_~}3
z?_^0X%(1(bwq=8@07wUofg%1$t?YZvTi!Q#E!abX`Uatp&j~2cfSIXDb1c-?PjX=n
zz_#<CkOX~xL;UjTS-x-XKJc3J*)^hx-<6V(Q+$3yT)2J%fKsW%<oGQm$0fFN!0uMs
z_3;mPNyOs-+`e+D;yV$KS2$nqd~o6V4N9dFrBVrik*n8iuX`)X5tGTN^W7fv-1^cA
zYx8q^?z|C>)O;!U{Dv60dhNh*)tR8Q3jlbUe5}ov*V>yc?*Q;<b_P$Auj0CTI1kY1
z@v^?OLUw1H?9MiTdAz=~LZip4Bv0u%zz9b~&)_LGlN%)Bah5Ni<HY#4g!=kv3w4lx
zyekU%9E~1t-SU9k4GQ_3xfO0EH%KnbInt~AAhem>pe@t^z=<#abAB_q0hDva?p9h=
ztP&HwT?|i6xc~u}+unDl2gUH}qLM5}IiR(@)7)~PyaoOB=lWC0{?+*WhH#SoCCWKq
zqPL5&<HzKkcI|GZU1P_OG11%Q)COg&JB;d@e_^Qiqqjz*(P%UpjYgx<Xfzs)=0&A0
zFEMM`JMi3ffz+yVqt>zxqNWj*FDcjl_{}`$cDs+H!`cPX{oeb4S_jBsD8Cjz2w6g3
zzBxuFlL0WlkAhX!^35?4(ZQM)UTYSBLOzEvFhu&{gIbB)L;B$ZjDaBv`CQFp9y*l{
zDsooeh4kv8%jY-5sgKUk)Y43I%iBP?Z0>Z*TKj%v_s65z8FshQuKo1ewcU!NCMhEv
z5uaSVXx8ST+?WKI&fmUriO;_Jn&{}LQqz)Ehjd=bf^sFO(c?A802&$^`036aN7ZOs
zf3QZf+WGl=_c{6DY4ciHvX(Od;0yQP^iKR}dnOp+h*-XSj?as)|F2xD?k7R0Xwa~u
z&vwL&aKtQqSKs~ld-rJzb(qFUV}G5#3pmf(a+-fId={WW{$_HcBJeT*s^xjxOF#;2
z^mv8Uc`MR!S+74z)z+%Bkk5(gwzz7fO{(R2M+W-*hBy-&0bpiovZ6vOOXo**em|YE
z3@<6<b6D-Dwa!BgnvTW9bSzepjg4?*&$(JK9gFR$221@;nxixtjYgx<Xfztl%gw*T
WAA1jgSdB^m0000<MNUMnLSTY|FJbur

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Adventure/Roles/remy.rsi/splat.png b/Resources/Textures/Adventure/Roles/remy.rsi/splat.png
new file mode 100644
index 0000000000000000000000000000000000000000..c23241882e4eead0cdb69df854549c0dd4f8874c
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$+et)0R9J=Wl)r1#U>t{^v`Q@<B+E@DaP;hf#6v=_l%D+$Zn&+(4To@(3W`g?
zDbhuh3W9@$Kshkz(83KuZz+^YJ9tNiHXtWrASYB*C>3#ygS;_6u3l_A6q;vAzWMQf
zp1g0~FQlZTq@<j8q|+Qs2QP4*XzXJPWL3=z)-~HYO6s2(#}de@npdgUL)V&y5ff>s
z8UT)MN!@PO1IXv|q0Ijl=ocOpso53{Rijy%B|9_6{*~(}iUNS^x*>@RNkheXG`zF9
z#m$SC*egx@_Zx=6&%=XQcs~ZtKvvZ}$F`(5)vC8qEYaEA;`7H3jOQj%+k2sBi?c;v
zq-hwm)?T3~3a;z=$LJCaB?%X`SZ6T{EqTO$wjgI{@3aB<{$-y^z0QmE4IV7792q`P
zAV}FXB_Z>2=?QO}uO-K}q?SBFLC&yy@Rfp`;o9~)|D9*|?*MSMSn3--P{6S*DZ1Sj
z#)kRUb0qk)@5ghKJm!$qp<nEjZ?O1&7l6z6ZgKbNb0GfTBo+`7!Mbdkp?YC#n3`>I
zyXP?9`vkzmqebBFl06*#5$hX*6Lms8(D?*Y)hZp+^lQ-zApS8Y7Klpdf$^ep`YE^l
jMCjl}MN(2y&K$o1NPMR&P1S$e00000NkvXXu0mjf)L;HD

literal 0
HcmV?d00001


From b219dfa9b3e2cf10ef6361c94cd4392cc1f4f0f0 Mon Sep 17 00:00:00 2001
From: RumiTiger <t.badredinov@gmail.com>
Date: Sun, 26 Jan 2025 17:19:11 -0300
Subject: [PATCH 2/4] fixes

---
 Resources/Maps/Adventure/Adventureamber.yml        | 14 +-------------
 Resources/Maps/Adventure/Adventurecluster.yml      | 12 ------------
 Resources/Maps/Adventure/Adventureloop.yml         | 12 ------------
 Resources/Maps/Adventure/Adventuremarathon.yml     | 12 ------------
 .../Prototypes/Adventure/Roles/Animals/remy.yml    |  3 +++
 5 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/Resources/Maps/Adventure/Adventureamber.yml b/Resources/Maps/Adventure/Adventureamber.yml
index e915857d49..74b6ce134d 100644
--- a/Resources/Maps/Adventure/Adventureamber.yml
+++ b/Resources/Maps/Adventure/Adventureamber.yml
@@ -11669,18 +11669,6 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: NavMap
-  - uid: 20475
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: ActionToggleInternals
   entities:
   - uid: 3027
@@ -65628,7 +65616,7 @@ entities:
       pos: -16.5,-17.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -33734.582
+      secondsUntilStateChange: -33671.855
       state: Closing
     - type: DeviceNetwork
       deviceLists:
diff --git a/Resources/Maps/Adventure/Adventurecluster.yml b/Resources/Maps/Adventure/Adventurecluster.yml
index 8889291bae..ec1b1d0172 100644
--- a/Resources/Maps/Adventure/Adventurecluster.yml
+++ b/Resources/Maps/Adventure/Adventurecluster.yml
@@ -4699,18 +4699,6 @@ entities:
       id: advCluster
     - type: SpreaderGrid
     - type: GridPathfinding
-  - uid: 12679
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 5973
diff --git a/Resources/Maps/Adventure/Adventureloop.yml b/Resources/Maps/Adventure/Adventureloop.yml
index 2cd274fd4f..ae0bc73d29 100644
--- a/Resources/Maps/Adventure/Adventureloop.yml
+++ b/Resources/Maps/Adventure/Adventureloop.yml
@@ -4362,18 +4362,6 @@ entities:
     - type: NavMap
     - type: BecomesStation
       id: advLoop
-  - uid: 13915
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 2659
diff --git a/Resources/Maps/Adventure/Adventuremarathon.yml b/Resources/Maps/Adventure/Adventuremarathon.yml
index 259c57d0a7..ba648d936b 100644
--- a/Resources/Maps/Adventure/Adventuremarathon.yml
+++ b/Resources/Maps/Adventure/Adventuremarathon.yml
@@ -7598,18 +7598,6 @@ entities:
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: NavMap
-  - uid: 22632
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 525
diff --git a/Resources/Prototypes/Adventure/Roles/Animals/remy.yml b/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
index 762a81d9e5..8f2f930cc3 100644
--- a/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
+++ b/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
@@ -36,6 +36,9 @@
     sprite: Adventure\Roles\remy.rsi
     equippedPrefix: 0
     quickEquip: false
+  - type: NpcFactionMember
+    factions:
+      - PetsNT
   - type: MobThresholds
     thresholds:
       0: Alive

From 391e721915dce322c0b7b5dc552e396da539f503 Mon Sep 17 00:00:00 2001
From: RumiTiger <t.badredinov@gmail.com>
Date: Mon, 27 Jan 2025 14:15:26 -0300
Subject: [PATCH 3/4] mouse in a hat

---
 Resources/Maps/Adventure/Adventureamber.yml   | 16 ++++-----
 Resources/Maps/Adventure/Adventureaspid.yml   | 30 ++++++++--------
 Resources/Maps/Adventure/Adventurebagel.yml   | 14 ++++----
 Resources/Maps/Adventure/Adventurecluster.yml | 26 ++++++++++----
 Resources/Maps/Adventure/Adventuredelta.yml   | 14 ++++----
 Resources/Maps/Adventure/Adventureloop.yml    | 34 +++++++++++++------
 .../Maps/Adventure/Adventuremarathon.yml      | 28 ++++++++++-----
 .../Adventure/Roles/Animals/remy.yml          | 18 ++++------
 8 files changed, 105 insertions(+), 75 deletions(-)

diff --git a/Resources/Maps/Adventure/Adventureamber.yml b/Resources/Maps/Adventure/Adventureamber.yml
index 74b6ce134d..44ac5562c0 100644
--- a/Resources/Maps/Adventure/Adventureamber.yml
+++ b/Resources/Maps/Adventure/Adventureamber.yml
@@ -55314,6 +55314,13 @@ entities:
     - type: Transform
       pos: -17.5,-57.5
       parent: 2
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 20476
+    components:
+    - type: Transform
+      pos: -8.760822,-30.469727
+      parent: 2
 - proto: CrateSecurityTrackingMindshieldImplants
   entities:
   - uid: 4184
@@ -65616,7 +65623,7 @@ entities:
       pos: -16.5,-17.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -33671.855
+      secondsUntilStateChange: -33846.67
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -110244,13 +110251,6 @@ entities:
     - type: Transform
       pos: 30.5,-55.5
       parent: 2
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 20476
-    components:
-    - type: Transform
-      pos: -6.5,-32.5
-      parent: 2
 - proto: SpawnMobParrot
   entities:
   - uid: 16167
diff --git a/Resources/Maps/Adventure/Adventureaspid.yml b/Resources/Maps/Adventure/Adventureaspid.yml
index eb53a1fb58..0c3b83749f 100644
--- a/Resources/Maps/Adventure/Adventureaspid.yml
+++ b/Resources/Maps/Adventure/Adventureaspid.yml
@@ -11234,7 +11234,7 @@ entities:
       pos: 12.5,-19.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -100084.57
+      secondsUntilStateChange: -100145.5
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -12168,7 +12168,7 @@ entities:
       pos: 28.5,10.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1244.527
+      secondsUntilStateChange: -1305.4606
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -12743,7 +12743,7 @@ entities:
       pos: -29.5,48.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -49818.26
+      secondsUntilStateChange: -49879.195
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -59292,7 +59292,7 @@ entities:
       pos: 2.5,16.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -97044.7
+      secondsUntilStateChange: -97105.63
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 184.2664844
@@ -59302,7 +59302,7 @@ entities:
       pos: 3.5,16.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -80373.31
+      secondsUntilStateChange: -80434.24
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 184.6998173
@@ -59372,7 +59372,7 @@ entities:
       pos: -31.5,16.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -25049.012
+      secondsUntilStateChange: -25109.945
       state: Closing
   - uid: 5679
     components:
@@ -59816,7 +59816,7 @@ entities:
       pos: -30.5,-6.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -54348.656
+      secondsUntilStateChange: -54409.59
       state: Closing
   - uid: 5809
     components:
@@ -60465,7 +60465,7 @@ entities:
       pos: -11.5,37.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -93717.47
+      secondsUntilStateChange: -93778.4
       state: Closing
   - uid: 9591
     components:
@@ -86549,6 +86549,13 @@ entities:
     - type: Transform
       pos: -13.497177,-24.441525
       parent: 1
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 18711
+    components:
+    - type: Transform
+      pos: 9.556043,-2.8593013
+      parent: 1
 - proto: Hemostat
   entities:
   - uid: 2628
@@ -103454,13 +103461,6 @@ entities:
     - type: Transform
       pos: -42.5,9.5
       parent: 1
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 18711
-    components:
-    - type: Transform
-      pos: 8.5,-0.5
-      parent: 1
 - proto: SpawnMobParrot
   entities:
   - uid: 3171
diff --git a/Resources/Maps/Adventure/Adventurebagel.yml b/Resources/Maps/Adventure/Adventurebagel.yml
index 1f81f9cfa6..b4f7fa25f6 100644
--- a/Resources/Maps/Adventure/Adventurebagel.yml
+++ b/Resources/Maps/Adventure/Adventurebagel.yml
@@ -109010,6 +109010,13 @@ entities:
     - type: Transform
       pos: 22.5,-0.5
       parent: 2
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 25297
+    components:
+    - type: Transform
+      pos: 24.561152,-30.371037
+      parent: 2
 - proto: HeatExchanger
   entities:
   - uid: 16501
@@ -131628,13 +131635,6 @@ entities:
     - type: Transform
       pos: 29.5,15.5
       parent: 2
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 25297
-    components:
-    - type: Transform
-      pos: 26.5,-34.5
-      parent: 2
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 20088
diff --git a/Resources/Maps/Adventure/Adventurecluster.yml b/Resources/Maps/Adventure/Adventurecluster.yml
index ec1b1d0172..22599dbd76 100644
--- a/Resources/Maps/Adventure/Adventurecluster.yml
+++ b/Resources/Maps/Adventure/Adventurecluster.yml
@@ -4699,6 +4699,18 @@ entities:
       id: advCluster
     - type: SpreaderGrid
     - type: GridPathfinding
+  - uid: 12679
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 5973
@@ -55143,6 +55155,13 @@ entities:
     - type: Transform
       pos: -18.5,-50.5
       parent: 1
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 12680
+    components:
+    - type: Transform
+      pos: 2.5185199,2.5625
+      parent: 1
 - proto: HeadSkeleton
   entities:
   - uid: 8257
@@ -67323,13 +67342,6 @@ entities:
     - type: Transform
       pos: -24.5,-17.5
       parent: 1
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 12680
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 1
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 11926
diff --git a/Resources/Maps/Adventure/Adventuredelta.yml b/Resources/Maps/Adventure/Adventuredelta.yml
index bf8203b550..543d37538f 100644
--- a/Resources/Maps/Adventure/Adventuredelta.yml
+++ b/Resources/Maps/Adventure/Adventuredelta.yml
@@ -191602,6 +191602,13 @@ entities:
     - type: Transform
       pos: 10.5,66.5
       parent: 2
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 40915
+    components:
+    - type: Transform
+      pos: -31.134789,36.573284
+      parent: 2
 - proto: HeatExchanger
   entities:
   - uid: 24641
@@ -230541,13 +230548,6 @@ entities:
     - type: Transform
       pos: 15.5,72.5
       parent: 2
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 40915
-    components:
-    - type: Transform
-      pos: -31.5,35.5
-      parent: 2
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 29993
diff --git a/Resources/Maps/Adventure/Adventureloop.yml b/Resources/Maps/Adventure/Adventureloop.yml
index ae0bc73d29..f3f793107e 100644
--- a/Resources/Maps/Adventure/Adventureloop.yml
+++ b/Resources/Maps/Adventure/Adventureloop.yml
@@ -4362,6 +4362,18 @@ entities:
     - type: NavMap
     - type: BecomesStation
       id: advLoop
+  - uid: 13915
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 2659
@@ -40645,7 +40657,7 @@ entities:
       pos: -9.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234935.27
+      secondsUntilStateChange: -234998.8
       state: Opening
   - uid: 6747
     components:
@@ -40653,7 +40665,7 @@ entities:
       pos: -8.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234935.97
+      secondsUntilStateChange: -234999.5
       state: Opening
   - uid: 6749
     components:
@@ -40661,7 +40673,7 @@ entities:
       pos: -6.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234934.53
+      secondsUntilStateChange: -234998.06
       state: Opening
   - uid: 6750
     components:
@@ -40669,7 +40681,7 @@ entities:
       pos: -5.5,51.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -234933.9
+      secondsUntilStateChange: -234997.44
       state: Opening
 - proto: CyberPen
   entities:
@@ -71408,6 +71420,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.4779639,50.30927
       parent: 2
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 13916
+    components:
+    - type: Transform
+      pos: -49.472656,47.221836
+      parent: 2
 - proto: HighSecArmoryLocked
   entities:
   - uid: 13965
@@ -86570,13 +86589,6 @@ entities:
     - type: Transform
       pos: -62.5,48.5
       parent: 2
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 13916
-    components:
-    - type: Transform
-      pos: -49.5,48.5
-      parent: 2
 - proto: SpawnMobParrot
   entities:
   - uid: 6325
diff --git a/Resources/Maps/Adventure/Adventuremarathon.yml b/Resources/Maps/Adventure/Adventuremarathon.yml
index ba648d936b..bfa06d6b4f 100644
--- a/Resources/Maps/Adventure/Adventuremarathon.yml
+++ b/Resources/Maps/Adventure/Adventuremarathon.yml
@@ -7598,6 +7598,18 @@ entities:
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: NavMap
+  - uid: 22632
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 525
@@ -10836,7 +10848,7 @@ entities:
       pos: -14.5,24.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -2251.1458
+      secondsUntilStateChange: -2290.9458
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -96644,6 +96656,13 @@ entities:
     - type: Transform
       pos: -43.530403,66.65333
       parent: 30
+- proto: HatChefNPCMouseRemy
+  entities:
+  - uid: 22633
+    components:
+    - type: Transform
+      pos: -14.433979,9.226749
+      parent: 30
 - proto: HeatExchanger
   entities:
   - uid: 9159
@@ -117423,13 +117442,6 @@ entities:
     - type: Transform
       pos: 33.5,4.5
       parent: 30
-- proto: SpawnMobMouseRemy
-  entities:
-  - uid: 22633
-    components:
-    - type: Transform
-      pos: -15.5,10.5
-      parent: 30
 - proto: SpawnMobParrot
   entities:
   - uid: 22525
diff --git a/Resources/Prototypes/Adventure/Roles/Animals/remy.yml b/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
index 8f2f930cc3..64f45309ff 100644
--- a/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
+++ b/Resources/Prototypes/Adventure/Roles/Animals/remy.yml
@@ -54,16 +54,10 @@
         Base: splat
 
 - type: entity
-  name: спавнер мышь Реми
-  id: SpawnMobMouseRemy
-  parent: MarkerBase
+  id: HatChefNPCMouseRemy
+  parent: ClothingHeadHatChef
+  suffix: Remy
   components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: icon
-        sprite: Adventure\Roles\remy.rsi
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobMouseRemy
+    - type: StorageFill
+      contents:
+        - id: MobMouseRemy

From 5311561a992fffb575765ccfcfa308757069eba7 Mon Sep 17 00:00:00 2001
From: RumiTiger <t.badredinov@gmail.com>
Date: Mon, 27 Jan 2025 14:21:26 -0300
Subject: [PATCH 4/4] map fixes

---
 Resources/Maps/Adventure/Adventurecluster.yml  | 12 ------------
 Resources/Maps/Adventure/Adventureloop.yml     | 12 ------------
 Resources/Maps/Adventure/Adventuremarathon.yml | 12 ------------
 3 files changed, 36 deletions(-)

diff --git a/Resources/Maps/Adventure/Adventurecluster.yml b/Resources/Maps/Adventure/Adventurecluster.yml
index 22599dbd76..689b1921ca 100644
--- a/Resources/Maps/Adventure/Adventurecluster.yml
+++ b/Resources/Maps/Adventure/Adventurecluster.yml
@@ -4699,18 +4699,6 @@ entities:
       id: advCluster
     - type: SpreaderGrid
     - type: GridPathfinding
-  - uid: 12679
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 5973
diff --git a/Resources/Maps/Adventure/Adventureloop.yml b/Resources/Maps/Adventure/Adventureloop.yml
index f3f793107e..579f0e9279 100644
--- a/Resources/Maps/Adventure/Adventureloop.yml
+++ b/Resources/Maps/Adventure/Adventureloop.yml
@@ -4362,18 +4362,6 @@ entities:
     - type: NavMap
     - type: BecomesStation
       id: advLoop
-  - uid: 13915
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 2659
diff --git a/Resources/Maps/Adventure/Adventuremarathon.yml b/Resources/Maps/Adventure/Adventuremarathon.yml
index bfa06d6b4f..596b507941 100644
--- a/Resources/Maps/Adventure/Adventuremarathon.yml
+++ b/Resources/Maps/Adventure/Adventuremarathon.yml
@@ -7598,18 +7598,6 @@ entities:
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: NavMap
-  - uid: 22632
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 525