From 526a58bafd75fe65ead47c1caa8a87a1122e1e13 Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Tue, 22 Aug 2023 22:30:16 +0300
Subject: [PATCH 01/10] Added new sec sign

---
 .../Structures/Wallmount/department_signs.yml     |  10 ++++++++++
 .../Wallmounts/department_signs.rsi/meta.json     |  14 ++++++++++++++
 .../Wallmounts/department_signs.rsi/sec.png       | Bin 0 -> 613 bytes
 3 files changed, 24 insertions(+)
 create mode 100644 Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
 create mode 100644 Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/sec.png

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
new file mode 100644
index 00000000000000..6f80992452a8d7
--- /dev/null
+++ b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: BaseSign
+  id: SignSecurityFrank
+  suffix: Frank
+  name: знак "СБ"
+  description: Знак, означающий что где-то вблизи живут герои этой станции.
+  components:
+  - type: Sprite
+    sprite: SS220/Structures/Wallmounts/department_signs.rsi
+    state: sec
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json b/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json
new file mode 100644
index 00000000000000..72c8d36a799963
--- /dev/null
+++ b/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified by TheArturZh, taken from Tau Ceti at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fdb350d16e0a4e4ba93d02ede2172aa9a7d8acb3",
+  "states": [
+	  {
+		"name": "sec"
+	  }
+  ]
+}
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/sec.png b/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/sec.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f142fab269da7f7b406d7c89a222adcc96ba133
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0s2WqK~z{r<(9uo
z!$1_rQ!RE9Cr5D-7ZDVPZaTPka;rGFszXFUoLv+$sH=n6&B^`+adQxa;v#||#nHjB
zB1XQKd+E#N?vk^u9sI!Kek6I{@4dT&l)^CdhRKL*hsMwiWVWDlv>sKb2jlDR_1mi)
zUX|ofkTI~(*og4rAi%;N>X#`4#-;XBh2@)B*^9B|GCtXD&B<OC5>SNz=5A|Gsb{ua
zMgwaTE!pdWq+CE1GCkAfB691D@*%ho#zn-@=3zAep~~ru2pyfBXCXp+>?#g&D*%v;
zf`i)vF^-EkC}coIcTK4pF5*CI;QC`;_F`z2y43>OBH9WaYEDA?1x_tK;439DtQ2rF
zn6sS~<TBlavTRe(2f}qte;o-DCr|}$oad@~k8-w)wE~F=#?<DL_tG2}f&GRUAHS_G
zCR@RCpw*EvfP^H<TLi?3Aoxt413ot8;FTfFr$)i|$7C-S>lcL#6cNWe^d7HF9)&9a
zbm9<eU)(3*TAe}$kd!Ar4?7|V+zN!t$_b|m00?ibR7B{;t~eXep;p8NqXE;sjhdsf
z7lScYug-H!xq#8Y!TY4_rP&V3-kJX;f<PbhCQP}2_OJLihp7mtMDAa4WB(+wm8=)A
zu=??y-GJ}=k?anHAPDRR{+hmA!(RCB20ZTv%tIoi?gN4r00000NkvXXu0mjfY-|xZ

literal 0
HcmV?d00001


From ebbc9153a8721ba60ae354e007d98ba74e465352 Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Tue, 22 Aug 2023 22:40:32 +0300
Subject: [PATCH 02/10] Changed wall map sprite

---
 .../Entities/Structures/Wallmount/wall_maps.yml   |   4 ++--
 .../Wallmounts/wallmap.rsi/frank_map.png          | Bin 0 -> 895 bytes
 .../Structures/Wallmounts/wallmap.rsi/meta.json   |  14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/frank_map.png
 create mode 100644 Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/wall_maps.yml b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/wall_maps.yml
index 56d4dd95228bd9..20a088338ffade 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/wall_maps.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/wall_maps.yml
@@ -7,8 +7,8 @@
   - type: ViewableStationMap
     mapTexture: SS220/ViewableMaps/Frankenstein.png
   - type: Sprite
-    state: metamap64x
-    sprite: Structures/Wallmounts/metamap.rsi
+    state: frank_map
+    sprite: SS220/Structures/Wallmounts/wallmap.rsi
     snapCardinals: false
     drawdepth: Overdoors
   - type: ActivatableUI
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/frank_map.png b/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/frank_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d5a13d9a707f386ad386861da99d67a351508ff
GIT binary patch
literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0~AR_K~!i%)tOId
z6HySxUp<HiQ7?*M{R1MgSWCs?LB&+GidY53i_k-?;>}t@z>DHRy|se%B-A#Cq8Cv}
z5v2hQq9Q`DRHf#i6k1PSL_7o$SH9Ob%XGV&eQ)<AX?`%wyiL2^`F7syY}!;P6hu8q
zCX*_v51|5-SFU$DHm_Ez#$x#SXK|(HP?K8v5-LFJj)a2~4O~8_jx+|DJENk#rCA)^
zoro{M_QW2wstqHZ$E5EqJac1!wFzSr`A`9tDX+z@)LYkcBQm#3uII5XNR}teW8nSV
z23kF!=SY`Y+2_aCOJeQTyE4{IPPY=QS3vgs2G>)}x!O7EdWvmRDS3!#%95%8qEaP<
z3Bb=~y#naM_+I1}+cvb{^<+V`K6)?h;gdCTJv4C5^}oA2qycZj_<LdJHlc16faJl&
znQ`fZ=*!%2#UX~5zf{pY7ycYn(LDGaV5I^kr{`28#N7DCMV?|)KAnm7X!Ryv34ZNC
zgjT@2*}qQQA&Bm_A0|Qsl|8Qjy88gbQ0z&N3qVbVx~(_X0b=NsJ)bYYhwNT00RV}h
zBY;s8q$J_};-vtu03D13pi<_(Qh9Ssem01yzSoP)d-qMLNe|#a1lj_trbna)zgl`#
z6ubraSiK^*@N=-P`<wJuw?O&J3l+s9tO6hg7X%4&i-OLz8*PC&pxcuXsr%ohaZV?)
z3m&hS0r<-mQ9c<>6fZRsfP)e>ZC2HyE&_N#6`%+3K0u%%`nMf+EeP8Grf3WB^wo?s
zz`qCJ$8GSqlv0sDoBoZthNQ`esy+q*l8xGwykLkTBXGwFzcHJC4rn{U&Yt?Ij_MO>
z3)m8YhA7iPiYFbH$UVSj*_+UOVpe+ZoDdab0gfNoq9VH@(A`9Wlq8^-AE)GPh!Cj)
zxCl1!mNXYahbZqPkpzJ9)e?d5tAc6}xd-@(z)O>xZQ_o|oY0q{LVm(2O??#kH<Ri}
zW6-s)T_oCeit9IT#rs0!-r%5v6Ez~ZaSw92cmkx;X-9<(NwHXrCqT8S@4v@|_zy^t
Vvnyfb^>zRN002ovPDHLkV1iZhn&JQe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json b/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json
new file mode 100644
index 00000000000000..25a53526da20ce
--- /dev/null
+++ b/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 64
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified by TheArturZh, taken from Tau Ceti at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fdb350d16e0a4e4ba93d02ede2172aa9a7d8acb3",
+  "states": [
+	  {
+		"name": "frank_map"
+	  }
+  ]
+}
\ No newline at end of file

From 0217b9b11108cc59df43292d9bc2aab55933ac73 Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Tue, 22 Aug 2023 22:52:08 +0300
Subject: [PATCH 03/10] Fix On Air sign glow

---
 .../Structures/Decorations/onair_sign.yml         |   7 +++++--
 .../Wallmounts/onair_sign.rsi/meta.json           |   3 +++
 .../Structures/Wallmounts/onair_sign.rsi/none.png | Bin 0 -> 157 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/none.png

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Decorations/onair_sign.yml b/Resources/Prototypes/SS220/Entities/Structures/Decorations/onair_sign.yml
index f7dddb92834c7c..c300121a366a69 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Decorations/onair_sign.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Decorations/onair_sign.yml
@@ -61,9 +61,12 @@
           True: { state: on }
           False: { state: off }
         glow:
-          True: { visible: true }
-          False: { visible: false }
+          True: { state: glow }
+          False: { state: none }
       enum.PowerDeviceVisuals.Powered:
         power:
+          True: { visible: false }
+          False: { visible: true }
+        glow:
           True: { visible: false }
           False: { visible: true }
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/meta.json b/Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/meta.json
index ea1297f3d92297..c27d4e5843c34a 100644
--- a/Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/meta.json
+++ b/Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/meta.json
@@ -15,6 +15,9 @@
 	  },
 	  {
 		"name": "glow"
+	  },
+	  {
+		"name": "none"
 	  }
   ]
 }
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/none.png b/Resources/Textures/SS220/Structures/Wallmounts/onair_sign.rsi/none.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2fcc2ccf6ef2e3e941c6ecd6a6ff60240d2d06b
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppmDGV@QPi+j9#U84P$1Z^-%of6m0e0Rb~-
nyxMX$<$JvjPz?e!ylr^G=&*&^*7Td;3y`p<tDnm{r-UW|0X{6D

literal 0
HcmV?d00001


From 1ef4650e08a753374102b97fddb6006d015e92fd Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Tue, 22 Aug 2023 23:23:51 +0300
Subject: [PATCH 04/10] Fix

---
 .../SS220/Entities/Structures/Wallmount/department_signs.yml  | 2 +-
 .../SS220/Structures/Wallmounts/wallmap.rsi/meta.json         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
index 6f80992452a8d7..528ec8b3a55ed1 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
@@ -3,7 +3,7 @@
   id: SignSecurityFrank
   suffix: Frank
   name: знак "СБ"
-  description: Знак, означающий что где-то вблизи живут герои этой станции.
+  description: Знак, означающий что где-то поблизости живут герои этой станции.
   components:
   - type: Sprite
     sprite: SS220/Structures/Wallmounts/department_signs.rsi
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json b/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json
index 25a53526da20ce..1ce46354ed298c 100644
--- a/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json
+++ b/Resources/Textures/SS220/Structures/Wallmounts/wallmap.rsi/meta.json
@@ -1,8 +1,8 @@
 {
   "version": 1,
   "size": {
-    "x": 32,
-    "y": 64
+    "x": 64,
+    "y": 32
   },
   "license": "CC-BY-SA-3.0",
   "copyright": "Modified by TheArturZh, taken from Tau Ceti at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fdb350d16e0a4e4ba93d02ede2172aa9a7d8acb3",

From d6a4c9983c47056c0b8f763ce0f07d18710d517e Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Tue, 22 Aug 2023 23:26:28 +0300
Subject: [PATCH 05/10] Frankenstein: fixes

---
 Resources/Maps/ss220-box.yml | 156 ++++++++++++++++++++++++-----------
 1 file changed, 106 insertions(+), 50 deletions(-)

diff --git a/Resources/Maps/ss220-box.yml b/Resources/Maps/ss220-box.yml
index 1146091cec1733..4c39997c6293d5 100644
--- a/Resources/Maps/ss220-box.yml
+++ b/Resources/Maps/ss220-box.yml
@@ -13852,7 +13852,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 21828
       type: Docking
-    - SecondsUntilStateChange: -421041.75
+    - SecondsUntilStateChange: -422674.25
       changeAirtight: False
       state: Opening
       type: Door
@@ -13870,7 +13870,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 562
       type: Docking
-    - SecondsUntilStateChange: -421041.75
+    - SecondsUntilStateChange: -422674.25
       changeAirtight: False
       state: Opening
       type: Door
@@ -13998,6 +13998,8 @@ entities:
     - pos: 13.5,-10.5
       parent: 8364
       type: Transform
+    - type: AccessReader
+      access: [["Maintenance"],["Command"]]
   - uid: 28187
     components:
     - pos: -21.5,52.5
@@ -14090,6 +14092,13 @@ entities:
       type: Transform
 - proto: AirlockMaintEngiLocked
   entities:
+  - uid: 5095
+    components:
+    - name: Инженерный склад
+      type: MetaData
+    - pos: -9.5,-46.5
+      parent: 8364
+      type: Transform
   - uid: 11650
     components:
     - pos: 61.5,15.5
@@ -14421,13 +14430,6 @@ entities:
       pos: -4.5,-58.5
       parent: 8364
       type: Transform
-  - uid: 24091
-    components:
-    - name: Инженерный склад
-      type: MetaData
-    - pos: -9.5,-46.5
-      parent: 8364
-      type: Transform
   - uid: 25969
     components:
     - pos: 87.5,-24.5
@@ -83422,9 +83424,9 @@ entities:
       type: Transform
 - proto: ClothingNeckMantleCE
   entities:
-  - uid: 7618
+  - uid: 29834
     components:
-    - pos: -1.370117,-59.311813
+    - pos: -1.3765825,-59.52243
       parent: 8364
       type: Transform
 - proto: ClothingNeckMantleHOP
@@ -83436,9 +83438,9 @@ entities:
       type: Transform
 - proto: ClothingNeckMantleHOS
   entities:
-  - uid: 26289
+  - uid: 26287
     components:
-    - pos: 16.533733,54.396873
+    - pos: 12.35581,53.921173
       parent: 8364
       type: Transform
 - proto: ClothingNeckMantleRD
@@ -87840,6 +87842,12 @@ entities:
     - pos: 0.5,9.5
       parent: 8364
       type: Transform
+  - uid: 8266
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 77.5,-37.5
+      parent: 8364
+      type: Transform
   - uid: 8702
     components:
     - rot: 1.5707963267948966 rad
@@ -93156,7 +93164,8 @@ entities:
       type: Transform
   - uid: 21055
     components:
-    - pos: 77.5,-37.5
+    - rot: -1.5707963267948966 rad
+      pos: 42.5,-45.5
       parent: 8364
       type: Transform
   - uid: 21056
@@ -95397,6 +95406,24 @@ entities:
     - pos: 76.5,-8.5
       parent: 8364
       type: Transform
+  - uid: 29830
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 74.5,-37.5
+      parent: 8364
+      type: Transform
+  - uid: 29831
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 75.5,-37.5
+      parent: 8364
+      type: Transform
+  - uid: 29832
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 76.5,-37.5
+      parent: 8364
+      type: Transform
 - proto: DisposalRouter
   entities:
   - uid: 22062
@@ -95811,6 +95838,12 @@ entities:
       pos: -2.5,41.5
       parent: 8364
       type: Transform
+  - uid: 26286
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 73.5,-37.5
+      parent: 8364
+      type: Transform
   - uid: 27559
     components:
     - pos: 6.5,-33.5
@@ -96339,6 +96372,11 @@ entities:
       type: Transform
 - proto: DrinkMugBlack
   entities:
+  - uid: 7353
+    components:
+    - pos: -0.99274945,-59.52243
+      parent: 8364
+      type: Transform
   - uid: 18382
     components:
     - pos: 53.98643,-33.364586
@@ -96367,7 +96405,7 @@ entities:
   entities:
   - uid: 29753
     components:
-    - pos: 12.487907,54.031906
+    - pos: 12.746435,53.9993
       parent: 8364
       type: Transform
 - proto: DrinkShaker
@@ -98539,13 +98577,6 @@ entities:
       - 29719
       - 29720
       type: DeviceList
-- proto: FireAxeCabinet
-  entities:
-  - uid: 8266
-    components:
-    - pos: 1.5,-10.5
-      parent: 8364
-      type: Transform
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 16508
@@ -98553,6 +98584,11 @@ entities:
     - pos: 6.5,-45.5
       parent: 8364
       type: Transform
+  - uid: 24091
+    components:
+    - pos: 1.5,-10.5
+      parent: 8364
+      type: Transform
 - proto: FireExtinguisher
   entities:
   - uid: 6616
@@ -144859,14 +144895,19 @@ entities:
     - pos: -10.400204,7.4809055
       parent: 8364
       type: Transform
-  - uid: 26847
+  - uid: 26848
     components:
-    - pos: -10.088213,9.755057
+    - pos: -12.493954,3.065948
       parent: 8364
       type: Transform
-  - uid: 26848
+  - uid: 29828
     components:
-    - pos: -12.493954,3.065948
+    - pos: -7.430661,-64.49338
+      parent: 8364
+      type: Transform
+  - uid: 29829
+    components:
+    - pos: -7.540036,-64.30588
       parent: 8364
       type: Transform
 - proto: KitchenKnife
@@ -146129,6 +146170,13 @@ entities:
         - On: On
         - Off: Off
       type: DeviceLinkSource
+- proto: LockedUnicaBox
+  entities:
+  - uid: 26288
+    components:
+    - pos: 16.5,54.5
+      parent: 8364
+      type: Transform
 - proto: LockerAtmosphericsFilled
   entities:
   - uid: 16556
@@ -147310,18 +147358,6 @@ entities:
     - pos: -2.3471565,49.546684
       parent: 8364
       type: Transform
-- proto: MagazinePistolSubMachineGunTopMounted
-  entities:
-  - uid: 26287
-    components:
-    - pos: 16.408733,54.63125
-      parent: 8364
-      type: Transform
-  - uid: 26288
-    components:
-    - pos: 16.361858,54.521873
-      parent: 8364
-      type: Transform
 - proto: MagazineRifle
   entities:
   - uid: 26566
@@ -148536,6 +148572,11 @@ entities:
     - pos: -29.5,-35.5
       parent: 8364
       type: Transform
+  - uid: 7618
+    components:
+    - pos: -5.5,-62.5
+      parent: 8364
+      type: Transform
   - uid: 11706
     components:
     - pos: 51.5,17.5
@@ -150635,6 +150676,13 @@ entities:
       pos: 20.5,40.5
       parent: 8364
       type: Transform
+- proto: PosterLegitSafetyInternals
+  entities:
+  - uid: 29835
+    components:
+    - pos: -7.5,-60.5
+      parent: 8364
+      type: Transform
 - proto: PosterLegitSafetyMothEpi
   entities:
   - uid: 29646
@@ -150649,6 +150697,11 @@ entities:
     - pos: 3.5,-58.5
       parent: 8364
       type: Transform
+  - uid: 29836
+    components:
+    - pos: 10.5,-59.5
+      parent: 8364
+      type: Transform
 - proto: PosterLegitSafetyMothPiping
   entities:
   - uid: 29645
@@ -157284,6 +157337,11 @@ entities:
     - pos: -5.5,-43.5
       parent: 8364
       type: Transform
+  - uid: 29827
+    components:
+    - pos: -7.5,-64.5
+      parent: 8364
+      type: Transform
 - proto: RadiationCollector
   entities:
   - uid: 3779
@@ -167927,16 +167985,16 @@ entities:
     - pos: -74.5,12.5
       parent: 8364
       type: Transform
-- proto: SignSecurity
+- proto: SignSecurityFrank
   entities:
-  - uid: 5095
+  - uid: 26289
     components:
-    - pos: 1.5,24.5
+    - pos: -2.5,31.5
       parent: 8364
       type: Transform
-  - uid: 7353
+  - uid: 26847
     components:
-    - pos: -2.5,31.5
+    - pos: 1.5,24.5
       parent: 8364
       type: Transform
 - proto: SignShipDock
@@ -177741,6 +177799,11 @@ entities:
     - pos: 10.5,-28.5
       parent: 8364
       type: Transform
+  - uid: 29833
+    components:
+    - pos: -8,0.5
+      parent: 8364
+      type: Transform
 - proto: WallmountTelescreen
   entities:
   - uid: 9424
@@ -197620,13 +197683,6 @@ entities:
     - pos: -2.3774498,51.28
       parent: 8364
       type: Transform
-- proto: WeaponSubMachineGunWt550
-  entities:
-  - uid: 26286
-    components:
-    - pos: 16.48465,54.646225
-      parent: 8364
-      type: Transform
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 27197

From 5e23d3eaee0a3016fbc63255b7eb3abf2ecc885f Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Wed, 23 Aug 2023 01:39:49 +0300
Subject: [PATCH 06/10] Frankenstein: improvements

---
 Resources/Maps/ss220-box.yml | 149 ++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 83 deletions(-)

diff --git a/Resources/Maps/ss220-box.yml b/Resources/Maps/ss220-box.yml
index 4c39997c6293d5..9ebad0295dc058 100644
--- a/Resources/Maps/ss220-box.yml
+++ b/Resources/Maps/ss220-box.yml
@@ -78,7 +78,7 @@ entities:
     - chunks:
         -1,-1:
           ind: -1,-1
-          tiles: SwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAAaAAAAaAAAAGgAAABoAAAAaAAAAGUAAABlAAAAZQAAAEsAAABLAAAASwAAAEsAAABoAAAASwAAAGgAAAAaAAAAGgAAABoAAABlAAAAZQAAAGUAAABlAAAAZQAAAGUAAABLAAACSwAAAEsAAABLAAAASwAAAEsAAAAaAAAAGgAAABoAAAAaAAAAZQAAAGUAAABlAAAAZQAAAGUAAABlAAAASwAAAEsAAABLAAAASwAAAGgAAABLAAAAaAAAABoAAAAaAAAAGgAAAGUAAABlAAAAZQAAAGUAAABlAAAAZQAAAEsAAANoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAGgAAABoAAABlAAAAaAAAAGUAAABlAAAAZQAAAGUAAABLAAABaAAAAGUAAABlAAAAZQAAAGUAAABlAAAAGgAAABoAAAAaAAAAGgAAABoAAABoAAAAaAAAAGgAAABoAAAASwAAAEsAAABlAAAAZQAAAGUAAABlAAAAZQAAAGgAAABoAAAAGgAAAGgAAABoAAAAGgAAAD4AAAA+AAAAPgAAAEsAAABoAAAASwAAAEsAAABLAAAASwAAAEsAAABoAAAAGgAAABoAAAAaAAABGgAAARoAAAIaAAADPgAAAD4AAABLAAAAaAAAAEsAAABLAAAASwAAAEsAAABLAAAAaAAAABoAAAAaAAAAGgAAARoAAAIaAAAAGgAAAj4AAAA+AAAASwAAAGgAAABLAAAASwAAAEsAAABLAAAASwAAAGgAAAAaAAADGgAAAhoAAAAaAAADGgAAABoAAAAaAAACGgAAAEsAAAJoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAGgAAARoAAAIaAAADGgAAAxoAAAFLAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAABoAAAMaAAACGgAAAhoAAAEaAAACSwAAAmgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEsAAAFLAAAASwAAA0sAAAJLAAAASwAAAksAAAJLAAADSwAAAEsAAANLAAADSwAAAEsAAABLAAADSwAAAksAAAFLAAAASwAAAksAAABLAAABSwAAAksAAANLAAACSwAAAEsAAAJLAAABSwAAAksAAAFLAAABSwAAA0sAAAJLAAADSwAAA0sAAAFLAAADSwAAAksAAANLAAAASwAAAksAAAJLAAAASwAAAEsAAAJLAAACSwAAAEsAAAFLAAAASwAAAw==
+          tiles: SwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAAaAAAAaAAAAGgAAABoAAAAaAAAAGUAAABlAAAAZQAAAEsAAABLAAAASwAAAEsAAABoAAAASwAAAGgAAAAaAAAAGgAAABoAAABlAAAAZQAAAGUAAABlAAAAZQAAAGUAAABLAAACSwAAAEsAAABLAAAASwAAAEsAAAAaAAAAGgAAABoAAAAaAAAAZQAAAGUAAABlAAAAZQAAAGUAAABlAAAASwAAAEsAAABLAAAASwAAAGgAAABLAAAAaAAAABoAAAAaAAAAGgAAAGUAAABlAAAAZQAAAGUAAABlAAAAZQAAAEsAAANoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAGgAAABoAAABlAAAAaAAAAGUAAABlAAAAZQAAAGUAAABLAAABaAAAAGUAAABlAAAAZQAAAGUAAABlAAAAGgAAABoAAAAaAAAAGgAAABoAAABoAAAAaAAAAGgAAAA+AAAASwAAAEsAAABlAAAAZQAAAGUAAABlAAAAZQAAAGgAAABoAAAAGgAAAGgAAABoAAAAGgAAAD4AAAA+AAAAPgAAAEsAAABoAAAASwAAAEsAAABLAAAASwAAAEsAAABoAAAAGgAAABoAAAAaAAABGgAAARoAAAIaAAADPgAAAD4AAABLAAAAaAAAAEsAAABLAAAASwAAAEsAAABLAAAAaAAAABoAAAAaAAAAGgAAARoAAAIaAAAAGgAAAj4AAAA+AAAASwAAAGgAAABLAAAASwAAAEsAAABLAAAASwAAAGgAAAAaAAADGgAAAhoAAAAaAAADGgAAABoAAAAaAAACGgAAAEsAAAJoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAGgAAARoAAAIaAAADGgAAAxoAAAFLAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAABoAAAMaAAACGgAAAhoAAAEaAAACSwAAAmgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEsAAAFLAAAASwAAA0sAAAJLAAAASwAAAksAAAJLAAADSwAAAEsAAANLAAADSwAAAEsAAABLAAADSwAAAksAAAFLAAAASwAAAksAAABLAAABSwAAAksAAANLAAACSwAAAEsAAAJLAAABSwAAAksAAAFLAAABSwAAA0sAAAJLAAADSwAAA0sAAAFLAAADSwAAAksAAANLAAAASwAAAksAAAJLAAAASwAAAEsAAAJLAAACSwAAAEsAAAFLAAAASwAAAw==
         0,0:
           ind: 0,0
           tiles: SwAAAEsAAAFLAAABaAAAAGgAAABoAAAAaAAAABoAAABLAAAASwAAAmgAAABoAAAAKQAAAGgAAABoAAAAaAAAAEsAAANLAAABSwAAA2gAAAAAAAAAAAAAAGgAAAAaAAACSwAAAEsAAABoAAAAQwAAAEMAAABDAAAAQwAAAEMAAABLAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEsAAABLAAAAaAAAAEMAAABDAAAAQwAAAEMAAABDAAAASwAAAmgAAABXAAAAWwAAAFsAAABbAAAAVwAAAGgAAABLAAABSwAAAmgAAABDAAAAQwAAAEMAAABDAAAAaAAAAEsAAABoAAAAVwAAAFsAAABbAAAAWwAAAFcAAABoAAAASwAAAksAAANoAAAAQwAAAEMAAABDAAAAQwAAABEAAABLAAABaAAAAFcAAABbAAAAWwAAAFsAAABXAAAAaAAAAEsAAABLAAABaAAAAEMAAABDAAAAQwAAAEMAAABoAAAASwAAAWgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABLAAAASwAAAGgAAABDAAAAQwAAAEMAAABDAAAAEQAAAEsAAABLAAAASwAAAEsAAABLAAAASwAAAEsAAABLAAAASwAAAUsAAABoAAAAaAAAAGgAAABoAAAAQwAAAGgAAABLAAADSwAAAEsAAABLAAAASwAAAEsAAABLAAAASwAAAEsAAABLAAADSwAAA0sAAAJLAAADSwAAAUsAAABLAAAASwAAAmgAAABLAAAASwAAAEsAAABLAAAASwAAAEsAAABLAAACSwAAAEsAAAJLAAABSwAAAksAAAJLAAABSwAAA0sAAABoAAAAaAAAAGgAAABLAAAAaAAAAEsAAABoAAAAaAAAAGgAAABLAAADSwAAA0sAAAFLAAABSwAAAUsAAAJLAAAAaAAAAB0AAAAdAAAAHQAAAEsAAABLAAAASwAAAEsAAABoAAAASwAAAksAAAJLAAABSwAAA0sAAAJLAAABSwAAAT8AAAA/AAAAPwAAAB0AAABLAAAASwAAAEsAAABLAAAAaAAAAEsAAAFLAAAASwAAAksAAAFLAAABSwAAAUsAAAE/AAAAPwAAAD8AAAAdAAAANwAAADcAAAA3AAAANwAAAGgAAABoAAAAZQAAAGUAAAJoAAAAaAAAABUAAABLAAADPwAAAD8AAAA/AAAAHQAAADcAAAA3AAAANwAAADcAAABoAAAAZQAAAGUAAABlAAADaAAAABUAAAAVAAAASwAAAWgAAAAdAAAAHQAAAB0AAAA3AAAANwAAADcAAAA3AAAAaAAAAGUAAABlAAADZQAAA2gAAAAVAAAAFQAAAA==
@@ -11125,17 +11125,13 @@ entities:
       parent: 8364
       type: Transform
     - ShutdownSubscribers:
-      - 10289
-      - 794
-      - 24420
+      - 5710
       - 26117
-      - 25966
-      - 25965
       type: DeviceNetwork
     - devices:
       - 10289
       - 794
-      - 24420
+      - 5710
       - 26117
       - 25966
       - 25965
@@ -12194,14 +12190,6 @@ entities:
     - pos: 12.5,-23.5
       parent: 8364
       type: Transform
-  - uid: 5710
-    components:
-    - name: Мостик
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-10.5
-      parent: 8364
-      type: Transform
   - uid: 24231
     components:
     - name: Каюта капитана
@@ -12403,6 +12391,14 @@ entities:
     - pos: -11.5,0.5
       parent: 8364
       type: Transform
+  - uid: 5707
+    components:
+    - name: Мостик
+      type: MetaData
+    - rot: 3.141592653589793 rad
+      pos: -0.5,-10.5
+      parent: 8364
+      type: Transform
   - uid: 6040
     components:
     - name: Мостик
@@ -13852,7 +13848,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 21828
       type: Docking
-    - SecondsUntilStateChange: -422674.25
+    - SecondsUntilStateChange: -423132.66
       changeAirtight: False
       state: Opening
       type: Door
@@ -13870,7 +13866,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 562
       type: Docking
-    - SecondsUntilStateChange: -422674.25
+    - SecondsUntilStateChange: -423132.66
       changeAirtight: False
       state: Opening
       type: Door
@@ -13998,8 +13994,10 @@ entities:
     - pos: 13.5,-10.5
       parent: 8364
       type: Transform
-    - type: AccessReader
-      access: [["Maintenance"],["Command"]]
+    - access:
+      - - Maintenance
+      - - Command
+      type: AccessReader
   - uid: 28187
     components:
     - pos: -21.5,52.5
@@ -15921,17 +15919,11 @@ entities:
     - pos: 16.5,6.5
       parent: 8364
       type: Transform
-    - ShutdownSubscribers:
-      - 24477
-      type: DeviceNetwork
   - uid: 25966
     components:
     - pos: 16.5,4.5
       parent: 8364
       type: Transform
-    - ShutdownSubscribers:
-      - 24477
-      type: DeviceNetwork
   - uid: 26083
     components:
     - pos: 6.5,-19.5
@@ -84206,6 +84198,8 @@ entities:
     - pos: -0.5,-11.5
       parent: 8364
       type: Transform
+    - buckleOffset: 0,0.1
+      type: Strap
   - uid: 27414
     components:
     - pos: 0.5,-11.5
@@ -103722,6 +103716,14 @@ entities:
       type: Transform
     - color: '#0335FCFF'
       type: AtmosPipeColor
+  - uid: 24417
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 14.5,6.5
+      parent: 8364
+      type: Transform
+    - color: '#0335FCFF'
+      type: AtmosPipeColor
   - uid: 24440
     components:
     - rot: 3.141592653589793 rad
@@ -104052,14 +104054,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 26118
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,5.5
-      parent: 8364
-      type: Transform
-    - color: '#FF1212FF'
-      type: AtmosPipeColor
   - uid: 26263
     components:
     - rot: 1.5707963267948966 rad
@@ -106889,6 +106883,14 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
+  - uid: 7256
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 13.5,4.5
+      parent: 8364
+      type: Transform
+    - color: '#0335FCFF'
+      type: AtmosPipeColor
   - uid: 7257
     components:
     - pos: 14.5,5.5
@@ -119199,14 +119201,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 24417
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,6.5
-      parent: 8364
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 24418
     components:
     - rot: -1.5707963267948966 rad
@@ -125152,13 +125146,6 @@ entities:
       type: Transform
     - color: '#0335FCFF'
       type: AtmosPipeColor
-  - uid: 27230
-    components:
-    - pos: 14.5,4.5
-      parent: 8364
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 27366
     components:
     - rot: -1.5707963267948966 rad
@@ -127881,13 +127868,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 7256
-    components:
-    - pos: 14.5,6.5
-      parent: 8364
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 7260
     components:
     - rot: -1.5707963267948966 rad
@@ -128244,10 +128224,11 @@ entities:
       type: AtmosPipeColor
   - uid: 9834
     components:
-    - pos: 12.5,5.5
+    - rot: -1.5707963267948966 rad
+      pos: 14.5,4.5
       parent: 8364
       type: Transform
-    - color: '#FF1212FF'
+    - color: '#0335FCFF'
       type: AtmosPipeColor
   - uid: 9958
     components:
@@ -129803,6 +129784,14 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
+  - uid: 24420
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 12.5,5.5
+      parent: 8364
+      type: Transform
+    - color: '#FF1212FF'
+      type: AtmosPipeColor
   - uid: 24435
     components:
     - rot: 1.5707963267948966 rad
@@ -131577,6 +131566,19 @@ entities:
       type: AmbientSound
     - color: '#0335FCFF'
       type: AtmosPipeColor
+  - uid: 5710
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 12.5,4.5
+      parent: 8364
+      type: Transform
+    - ShutdownSubscribers:
+      - 24477
+      type: DeviceNetwork
+    - enabled: False
+      type: AmbientSound
+    - color: '#0335FCFF'
+      type: AtmosPipeColor
   - uid: 6193
     components:
     - pos: 3.5,-13.5
@@ -131929,9 +131931,6 @@ entities:
       pos: 14.5,1.5
       parent: 8364
       type: Transform
-    - ShutdownSubscribers:
-      - 24477
-      type: DeviceNetwork
     - enabled: False
       type: AmbientSound
     - color: '#0335FCFF'
@@ -132690,19 +132689,6 @@ entities:
       type: AmbientSound
     - color: '#0335FCFF'
       type: AtmosPipeColor
-  - uid: 24420
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,6.5
-      parent: 8364
-      type: Transform
-    - ShutdownSubscribers:
-      - 24477
-      type: DeviceNetwork
-    - enabled: False
-      type: AmbientSound
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 24464
     components:
     - pos: 35.5,-0.5
@@ -133839,9 +133825,6 @@ entities:
       pos: 13.5,1.5
       parent: 8364
       type: Transform
-    - ShutdownSubscribers:
-      - 24477
-      type: DeviceNetwork
     - enabled: False
       type: AmbientSound
     - color: '#FF1212FF'
@@ -135796,7 +135779,7 @@ entities:
       type: AtmosPipeColor
   - uid: 26117
     components:
-    - pos: 11.5,6.5
+    - pos: 12.5,6.5
       parent: 8364
       type: Transform
     - ShutdownSubscribers:
@@ -198276,12 +198259,6 @@ entities:
       type: Transform
 - proto: WindoorSecureCaptainLocked
   entities:
-  - uid: 5707
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-7.5
-      parent: 8364
-      type: Transform
   - uid: 14125
     components:
     - rot: -1.5707963267948966 rad
@@ -198343,6 +198320,12 @@ entities:
     - pos: -20.5,-77.5
       parent: 8364
       type: Transform
+  - uid: 26118
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -1.5,-7.5
+      parent: 8364
+      type: Transform
   - uid: 27433
     components:
     - rot: -1.5707963267948966 rad

From 0b3c43607abae6b114531819196bc257ce296be6 Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Wed, 23 Aug 2023 02:24:08 +0300
Subject: [PATCH 07/10] Frankenstein: tweaks & small drains

---
 Resources/Maps/ss220-box.yml                  |  73 +++++++++++++++++-
 .../Entities/Objects/Specific/small_drain.yml |  10 +++
 .../Specific/small_drain.rsi/fill-1.png       | Bin 0 -> 643 bytes
 .../Objects/Specific/small_drain.rsi/icon.png | Bin 0 -> 1017 bytes
 .../Specific/small_drain.rsi/meta.json        |  19 +++++
 5 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Specific/small_drain.yml
 create mode 100644 Resources/Textures/SS220/Objects/Specific/small_drain.rsi/fill-1.png
 create mode 100644 Resources/Textures/SS220/Objects/Specific/small_drain.rsi/icon.png
 create mode 100644 Resources/Textures/SS220/Objects/Specific/small_drain.rsi/meta.json

diff --git a/Resources/Maps/ss220-box.yml b/Resources/Maps/ss220-box.yml
index 9ebad0295dc058..3aac0fd6a3345d 100644
--- a/Resources/Maps/ss220-box.yml
+++ b/Resources/Maps/ss220-box.yml
@@ -12393,12 +12393,18 @@ entities:
       type: Transform
   - uid: 5707
     components:
-    - name: Мостик
+    - name: Командная рубка
       type: MetaData
     - rot: 3.141592653589793 rad
       pos: -0.5,-10.5
       parent: 8364
       type: Transform
+    - access:
+      - - Captain
+      - - HeadOfPersonnel
+      - - Blueshield
+      - - HeadOfSecurity
+      type: AccessReader
   - uid: 6040
     components:
     - name: Мостик
@@ -13848,7 +13854,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 21828
       type: Docking
-    - SecondsUntilStateChange: -423132.66
+    - SecondsUntilStateChange: -423340.6
       changeAirtight: False
       state: Opening
       type: Door
@@ -13866,7 +13872,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 562
       type: Docking
-    - SecondsUntilStateChange: -423132.66
+    - SecondsUntilStateChange: -423340.6
       changeAirtight: False
       state: Opening
       type: Door
@@ -85996,6 +86002,8 @@ entities:
     - pos: -4.5,-17.5
       parent: 8364
       type: Transform
+    - locked: False
+      type: Lock
 - proto: CrateTrashCart
   entities:
   - uid: 29746
@@ -101061,6 +101069,57 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+- proto: FloorDrainSmall
+  entities:
+  - uid: 27230
+    components:
+    - pos: 11.5,6.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 29837
+    components:
+    - pos: 11.5,5.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 29838
+    components:
+    - pos: 11.5,4.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 29839
+    components:
+    - pos: -22.5,33.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 29840
+    components:
+    - pos: -21.5,33.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 29841
+    components:
+    - pos: 10.5,-10.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 29842
+    components:
+    - pos: 10.5,-9.5
+      parent: 8364
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
 - proto: FloorTileItemArcadeBlue2
   entities:
   - uid: 917
@@ -198322,10 +198381,18 @@ entities:
       type: Transform
   - uid: 26118
     components:
+    - name: Командная рубка
+      type: MetaData
     - rot: 3.141592653589793 rad
       pos: -1.5,-7.5
       parent: 8364
       type: Transform
+    - access:
+      - - Captain
+      - - HeadOfPersonnel
+      - - Blueshield
+      - - HeadOfSecurity
+      type: AccessReader
   - uid: 27433
     components:
     - rot: -1.5707963267948966 rad
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/small_drain.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/small_drain.yml
new file mode 100644
index 00000000000000..99cfdc1dce1a4a
--- /dev/null
+++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/small_drain.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: FloorDrainSmall
+  parent: FloorDrain
+  name: маленький дренаж
+  description: Сливает лужи вокруг в себя. Пригодится для опорожнения ведер или поддержания чистоты в определенных помещениях.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: SS220/Objects/Specific/small_drain.rsi
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/fill-1.png b/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a37e97926e6c599868d3c2807fe48af2c565c22
GIT binary patch
literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004lX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmKpe$i(@I4u4rY+zkfAzR@C$L2C>Fs&X)CnqU~>J0CJjl7
zi=*ILaPVWX>fqw6tAnc`2!4P#Iyou2NQwVT3N1nfFC6#dUEbsF9UwF+OtS*xfTr7K
zGA2uz?5Y%eMF1jw69_BJGUBPlG`fzjd-(Wz7v)*_-{{ZfEe7}`;yGrRHt`1W%%*K{
z-X|7WNy!nP6OWm6K;lQPs~*2`F1jr6Owmjy=ZQsPso2442eXo?5l<6Ga+*&0LdN49
z=Pk}!rN&z4<TniE^_3LYX$~WXCB%_{1Qj)uQGtyptvV?dlC&>(@rPZ1f?O)O%3$PJ
zKouGk*AM;%zq_>xQ<Gj&NCtXd9Oq*M2<`&Sy5oEwJ5KWi@IM1rdfQ)Z0JEQ@*V|g;
z2pHG~F0R{}x(8hD07FlPVk)lWrzsQ)!220JQx+J!1^U*!-dg)OeE`zb)$$E+a0rYR
zDSN%ky?Z-*`|}^SKgd70qjJMg&M?RT000SaNLh0L01FcU01FcV0GgZ_0001{Nkl<Z
zcwX(<K?=e!5J1uBjeC+FSqZdIEC$ky8H(?1A{70}pl(tC008K)uIuZ#&KA{wZtJkD
zLF}&fy9dw;%@{&<pE~7z(%;r!itcy+1eRraY%fn*&!R;4FZ~J5IA}|D9{>OV008(i
zBiB(8Qu{TUb?_>(KYYb>+(^ci)o8!_4R=5Ar{NFq4VWyue^NJe+|+Do{XLp>`0PFa
d0B~oeyaAM6h&3z@&@TW0002ovPDHLkV1kC57#siq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/icon.png b/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa2c25a095b32f889fde6bfecb2655702fc165d7
GIT binary patch
literal 1017
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~JBGb`J1#c2)=|%1_J8No8Qr
zI6rlwt;b;pnWOQSy<D~U(k48bu+S><19#yR4Y7kxnc7=kB^3Q_QRDUO>R$XHs^CNN
z##av>ty$f?T7jdk!NST?bC*Zwe{U{bCsuu#?~h~eJ$@&vV4~%-ndx!EvfF7!YTh&7
ztP-hlWl*XW=FmQ4^l0T#lU;r5tAG5c5`P-`<Nk~DPj%UTs64Vvn_>2m?c<qcxdr#s
z#UedV3eFeqpIPGY$bH>vx&4KDyL3MIT=Y?Y-szgO^2Wg|_RW)43i=DX7tQkf>2&O|
z%yZpyQA>|SJ%3`(^YrUfk?Wa!%5ADgCN{8$nobF9?A2Inr71RPi+=gX_SpKS7_FVB
z5}rgjh)RiE=l{pHfA?0d;K^}89&A-{GS8D)INmXx-SxOe-rDao%LjYr@T%MKxeS}<
zFS&j@>IsL$4K}@Xw`c8Qk9o)7?BAB8weHDsO%bjGza?#h#U%Ey{<^m3Ues@kT82wk
zu72VzDB$Q3)2!ZmdT+IL_3zK}+wD)-?^s-PIN+SY31F;n7I;J!Gca%qgD@k*tT_@4
z3`{bfE{-7;ac^fC`W<!<a5dKyP}sSIHy}{uP75=G`GO^mc1}ke8-6=<U1(Xdbc>54
z;}d=3iI3U(jUPA7RFAa3xAlv8{q?dpCm%d|W>%Tz@oE}J!xddYhLzDu3_;sn7?$L9
zGI$&nk$1oUwRcvv^Xd3MItS9ym(Q=9KU4qPrm*(+&3_JZ<kny0YWR8ZgXwJl<(EyW
zEAMICy0HCp&Y#xS{Xaw`Wap<i8_er5?`m9dUMlzhHAaO<zkM2AceX{X+a^+LaV$wR
z;^+2#Y#$iHPH!*0q?~n^joI;j&Bpb0x*I-;&u8NA_kX?Q{pQHvi`x(PE)~7?Z*9NZ
zq8*o}rOy0bDHgGM)hVD6kNgsz>d({Dag;b4msUBy)W-6B?X`^GyZ_5x__;LWvsd=t
zqq8%99*<6hd+Dwa<AhzRObVsmEDo4{eksEc=k>|WckiO7>pw;9Ss(t$;dcBMri3_s
z|HT3aSv_B0ve@te=r#?<!(YCC)`*RdeO6Q|zqD|{Tm5x>hk3qMh$tH}h^R@PzO`WL
zehUUa`6*BDrYWqrxX><LwqaZSnuZ9*rrQa%Vjs+>{^E%^XP5j?e;@aQYt2hO=JPD!
zPq??#>^>_fP#I>hYNRPGUH{eW%t_|cH`BNLJ<4ccBXHrkc>bcN_kTt*EZY+pyguV+
kIp2f*0%#u6)cnhET3BMLwK9(@F!3;Wy85}Sb4q9e0GzwX(EtDd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/meta.json b/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/meta.json
new file mode 100644
index 00000000000000..8c0f332d1ea324
--- /dev/null
+++ b/Resources/Textures/SS220/Objects/Specific/small_drain.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+   "version":1,
+   "size":{
+      "x":32,
+      "y":32
+   },
+   "license":"CC-BY-NC-SA-3.0",
+   "copyright":"fill-1.png is made for SS220 by TheArturZh. icon.png is taken from Goonstation at commit https://github.com/goonstation/goonstation/tree/66a62ad4c8a733a4c1baa65aa217c5dc71e1bec8",
+   "states":[
+      {
+         "name":"icon",
+         "directions": 4
+      },
+	  {
+		  "name": "fill-1",
+		  "directions": 4
+	  }
+   ]
+}

From 37d74fc5c90ace614106ef36b18bf959f0742bd3 Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Wed, 23 Aug 2023 02:31:39 +0300
Subject: [PATCH 08/10] Frankenstein: armory pistol mag fix

---
 Resources/Maps/ss220-box.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Maps/ss220-box.yml b/Resources/Maps/ss220-box.yml
index 3aac0fd6a3345d..6808cfae5a1d9c 100644
--- a/Resources/Maps/ss220-box.yml
+++ b/Resources/Maps/ss220-box.yml
@@ -13854,7 +13854,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 21828
       type: Docking
-    - SecondsUntilStateChange: -423340.6
+    - SecondsUntilStateChange: -423419.3
       changeAirtight: False
       state: Opening
       type: Door
@@ -13872,7 +13872,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 562
       type: Docking
-    - SecondsUntilStateChange: -423340.6
+    - SecondsUntilStateChange: -423419.3
       changeAirtight: False
       state: Opening
       type: Door
@@ -147378,26 +147378,26 @@ entities:
     - pos: -52.5,5.5
       parent: 8364
       type: Transform
-- proto: MagazinePistolHighCapacity
+- proto: MagazinePistol
   entities:
   - uid: 26579
     components:
-    - pos: -2.7534065,49.49981
+    - pos: -2.3107386,49.54476
       parent: 8364
       type: Transform
   - uid: 26589
     components:
-    - pos: -2.6596565,49.515434
+    - pos: -2.4357386,49.54476
       parent: 8364
       type: Transform
   - uid: 26599
     components:
-    - pos: -2.5659065,49.515434
+    - pos: -2.7326136,49.54476
       parent: 8364
       type: Transform
   - uid: 26601
     components:
-    - pos: -2.3471565,49.546684
+    - pos: -2.5763636,49.54476
       parent: 8364
       type: Transform
 - proto: MagazineRifle

From 5c2353e37536d238f8f80657d084ee50586196b7 Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Wed, 23 Aug 2023 02:54:25 +0300
Subject: [PATCH 09/10] Frankenstein: new signs and painting

---
 Resources/Maps/ss220-box.yml                  |  25 +++++++++---------
 .../Entities/Structures/Decorations/signs.yml |  12 ++++++++-
 .../Structures/Wallmount/department_signs.yml |  13 ++++++++-
 .../SS220/Objects/Weapons/Guns/bobross.png    | Bin 0 -> 1801 bytes
 .../Decorations/signs.rsi/bobross.png         | Bin 0 -> 1801 bytes
 .../Decorations/signs.rsi/court.png           | Bin 259 -> 511 bytes
 .../Decorations/signs.rsi/meta.json           |   5 +++-
 .../department_signs.rsi/armory.png           | Bin 0 -> 528 bytes
 .../Wallmounts/department_signs.rsi/meta.json |   5 +++-
 9 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/bobross.png
 create mode 100644 Resources/Textures/SS220/Structures/Decorations/signs.rsi/bobross.png
 create mode 100644 Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/armory.png

diff --git a/Resources/Maps/ss220-box.yml b/Resources/Maps/ss220-box.yml
index 6808cfae5a1d9c..ddb1383a28906d 100644
--- a/Resources/Maps/ss220-box.yml
+++ b/Resources/Maps/ss220-box.yml
@@ -13854,7 +13854,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 21828
       type: Docking
-    - SecondsUntilStateChange: -423419.3
+    - SecondsUntilStateChange: -423530.9
       changeAirtight: False
       state: Opening
       type: Door
@@ -13872,7 +13872,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 562
       type: Docking
-    - SecondsUntilStateChange: -423419.3
+    - SecondsUntilStateChange: -423530.9
       changeAirtight: False
       state: Opening
       type: Door
@@ -148799,13 +148799,6 @@ entities:
     - pos: -3.5,-10.5
       parent: 8364
       type: Transform
-- proto: PaintingTheGreatWave
-  entities:
-  - uid: 28885
-    components:
-    - pos: 2.5,-10.5
-      parent: 8364
-      type: Transform
 - proto: PaintingTheScream
   entities:
   - uid: 15309
@@ -150067,6 +150060,13 @@ entities:
     - pos: 52.54258,-74.65333
       parent: 8364
       type: Transform
+- proto: PictureBobRoss
+  entities:
+  - uid: 25770
+    components:
+    - pos: 2.5,-10.5
+      parent: 8364
+      type: Transform
 - proto: PinpointerNuclear
   entities:
   - uid: 17305
@@ -167114,12 +167114,11 @@ entities:
     - pos: 68.5,-48.5
       parent: 8364
       type: Transform
-- proto: SignArmory
+- proto: SignArmoryFrank
   entities:
-  - uid: 25770
+  - uid: 28885
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,47.5
+    - pos: 2.5,47.5
       parent: 8364
       type: Transform
 - proto: SignAtmos
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Decorations/signs.yml b/Resources/Prototypes/SS220/Entities/Structures/Decorations/signs.yml
index 994532f3c31e5b..89eeaae2e0bd91 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Decorations/signs.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Decorations/signs.yml
@@ -36,4 +36,14 @@
   components:
   - type: Sprite
     sprite: SS220/Structures/Decorations/signs.rsi
-    state: ntflag
\ No newline at end of file
+    state: ntflag
+
+- type: entity
+  parent: BaseSign
+  id: PictureBobRoss
+  name: картина "Художник за работой"
+  description: На картине изображён художник, создающий счастливые случайности.
+  components:
+  - type: Sprite
+    sprite: SS220/Structures/Decorations/signs.rsi
+    state: bobross
\ No newline at end of file
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
index 528ec8b3a55ed1..cfea54335cdd2e 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Wallmount/department_signs.yml
@@ -7,4 +7,15 @@
   components:
   - type: Sprite
     sprite: SS220/Structures/Wallmounts/department_signs.rsi
-    state: sec
\ No newline at end of file
+    state: sec
+
+- type: entity
+  parent: BaseSign
+  id: SignArmoryFrank
+  suffix: Frank
+  name: знак "оружейшая"
+  description: Знак, означающий что где-то поблизости находится склад с игрушками для взрослых.
+  components:
+  - type: Sprite
+    sprite: SS220/Structures/Wallmounts/department_signs.rsi
+    state: armory
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/bobross.png b/Resources/Textures/SS220/Objects/Weapons/Guns/bobross.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee9c491a82b7fd28aac2f729031eb44b95b34ed
GIT binary patch
literal 1801
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Structures/Decorations/signs.rsi/bobross.png b/Resources/Textures/SS220/Structures/Decorations/signs.rsi/bobross.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee9c491a82b7fd28aac2f729031eb44b95b34ed
GIT binary patch
literal 1801
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Structures/Decorations/signs.rsi/court.png b/Resources/Textures/SS220/Structures/Decorations/signs.rsi/court.png
index 50dbd14cbe47dac7a6ec939208171d4ff0b00f8f..cdc398931c469e89a4fc6bc5e1e8cdb26d89c020 100644
GIT binary patch
delta 497
zcmV<N0S^9y0{;V$7=H)`0001UdV2H#0004VQb$4nuFf3k00004XF*Lt006O%3;baP
z00009a7bBm000id000id0mpBsWB>pGlu1NER9HvNm%T~^F%ZXdigtqFXLpB<V0nmz
zg;@FmT3h=DK7nswZLKe0DHawYR|<A_rHUZfDH`v;&cLvjWPfKT%dI~MGaHu7KQsB*
z?Rf89o6L}Hjc5jT4~`p4&E54yhujH*0ua2rx#O1Bdemd*?Rn@%Pxny~69PDRZ`_(<
zI2I5S5nKby>l@@XLu$OBfZ4fu^3wFTR>(_}8ZT=X9PW3?bMEY9yJ!#vt0j9Ia^TbR
zhoV6gtQM014u1+buoaa61mo1o*_OdO=+~|dpb~&VIklm{06_<juZ0h*6_LFL7zE`E
zp|O}MR06cA<qXBL6rxgqHMLrT0=~aK$+M?cBF8He6yW_2d4E_^D=CjBF)c!r0oees
zIc2FW0Kw!D4Df6f5xkE3dq-|zag}=V`FMYEgWF5}b!t3K)B?Efvi8z~@;e&T0;-N;
zQ1>PT<`P`pjB3p^hFJg(B<r~#Q48Q1^Q_rNKR-*WrS)y7`Yf+ID<I30`Yiu{KPC)B
nkef{`IEV_E7Upf(49@)mD{bgf1}gf@00000NkvXXu0mjf7h%;t

delta 243
zcmV<P01W^C1A_vP7=Hu<0001iRA<Kk000|MOjJex|Nl8hUs!IHYlXFVmCI~~w{MHR
zs=wg>|NlbERV@Gj00DGTPE!Ct=GbNc005RrL_t(2k&V&84Z<)C1<<kq6qS3$2y6g`
zc%U3Iz?bmYIGD6{DgpmcHBUcHDi6ayIkfC;y*pn%nGHs2xolcxTHtPQs_&^j9uAnK
zL=b`pU3=gHrj%R*`i)FEg6>*C+Z>M7wuh;<+1>PL7t`EUNb-zOL~;Pj7XXzE1OPga
t9su!B&~1sQjQTI{v@vW3wHf7)ya3KiRjA(em(c(K002ovPDHLkV1kZBXsiGL

diff --git a/Resources/Textures/SS220/Structures/Decorations/signs.rsi/meta.json b/Resources/Textures/SS220/Structures/Decorations/signs.rsi/meta.json
index 798d182e419689..1533d00ddb97da 100644
--- a/Resources/Textures/SS220/Structures/Decorations/signs.rsi/meta.json
+++ b/Resources/Textures/SS220/Structures/Decorations/signs.rsi/meta.json
@@ -5,7 +5,7 @@
         "y":32
     },
     "license":"CC-BY-SA-3.0",
-    "copyright":"Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/tree/724d11274bf173044330ddc5f230c3abd80df8d2",
+    "copyright":"court.png is modified by TheArturZh for SS220. Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/tree/724d11274bf173044330ddc5f230c3abd80df8d2",
     "states":[
         {
             "name":"court"
@@ -18,6 +18,9 @@
         },
 		{
             "name":"ntflag"
+        },
+		{
+            "name":"bobross"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/armory.png b/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/armory.png
new file mode 100644
index 0000000000000000000000000000000000000000..605ab38b681c44363d6b2c35e8717dee21519dfb
GIT binary patch
literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0i{VqK~z{r<(0om
z1ThfCbN<0bu&}bS61~RC;tFl`9c--b1r}^XJhZS8wi27e!p3*dYC(%DtZYuPva(V*
zuo01!Z_Pk1B$LVR>K6VW%w%up^36<=ZDm=enq)%T#%NrCvjy|R!+dG=L(i)7bU&kB
z+r5^aj^Py0ncmA0R2N8Q@OkVMz_y@j6(sSjfYY-n?Uh3k&kERDpVVGCB=J#uV5dLQ
zo>JTG*}`59-wSJV(Vf#?g*{+mE)KA;Z}Aw!6}Y<n(q0(5^tDs~e~LkwW0=p#$B4lz
zz?HGx2Fx+ce%pj9=M{iV%wT(QEK0)%;zJc-D`1Nt=mc<Z@g~6vkTo+6?S3;3mc#oo
z3Mr2PB77es@hSK%SOGVWBXx59P*?!po=YqTD`4>aqINe|3QO4YszkQ{S#=f{^lUs!
zJU6p9-}4bI02SC+{y7owF$k&{kXDKnKpFWm!Ee$`eXz%n&T?7IyP(uD+&_QQUO6Q3
ztN`kDStRk!7Tom@^3W9;1KP0GJ#x0dDIiIbT)VZArm0-OUlM%})Xjevpwu@g2kBK$
SYVv*n0000<MNUMnLSTYkFz4g|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json b/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json
index 72c8d36a799963..78a4d26bea23e4 100644
--- a/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json
+++ b/Resources/Textures/SS220/Structures/Wallmounts/department_signs.rsi/meta.json
@@ -5,10 +5,13 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified by TheArturZh, taken from Tau Ceti at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fdb350d16e0a4e4ba93d02ede2172aa9a7d8acb3",
+  "copyright": "Modified by TheArturZh for SS220, originals are taken from Tau Ceti at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fdb350d16e0a4e4ba93d02ede2172aa9a7d8acb3",
   "states": [
 	  {
 		"name": "sec"
+	  },
+	  {
+		"name": "armory"
 	  }
   ]
 }

From 36534b2a5d2b6cf13068b6bc8e3c11d382be8e5f Mon Sep 17 00:00:00 2001
From: Artur Zhidkov <thearturzh@gmail.com>
Date: Wed, 23 Aug 2023 04:45:42 +0300
Subject: [PATCH 10/10] Added autoengraving for mateba

---
 .../AutoEngrave/AutoEngravingComponent.cs     | 10 ++++
 .../SS220/AutoEngrave/AutoEngravingSystem.cs  | 21 +++++++
 .../AutoEngrave/EngraveNameOnOpenComponent.cs | 14 +++++
 .../AutoEngrave/EngraveNameOnOpenSystem.cs    | 55 +++++++++++++++++++
 .../Locale/ru-RU/ss220/auto-engravings.ftl    |  1 +
 .../SS220/Entities/Weapons/Guns/hosgun.yml    |  6 +-
 6 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/SS220/AutoEngrave/AutoEngravingComponent.cs
 create mode 100644 Content.Server/SS220/AutoEngrave/AutoEngravingSystem.cs
 create mode 100644 Content.Server/SS220/AutoEngrave/EngraveNameOnOpenComponent.cs
 create mode 100644 Content.Server/SS220/AutoEngrave/EngraveNameOnOpenSystem.cs
 create mode 100644 Resources/Locale/ru-RU/ss220/auto-engravings.ftl

diff --git a/Content.Server/SS220/AutoEngrave/AutoEngravingComponent.cs b/Content.Server/SS220/AutoEngrave/AutoEngravingComponent.cs
new file mode 100644
index 00000000000000..c0748c63865ef0
--- /dev/null
+++ b/Content.Server/SS220/AutoEngrave/AutoEngravingComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.SS220.AutoEngrave;
+
+[RegisterComponent]
+public sealed class AutoEngravingComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField("autoEngraveLocKey")]
+    public string? AutoEngraveLocKey;
+    [ViewVariables(VVAccess.ReadWrite), DataField("engravedText")]
+    public string EngravedText = "";
+}
diff --git a/Content.Server/SS220/AutoEngrave/AutoEngravingSystem.cs b/Content.Server/SS220/AutoEngrave/AutoEngravingSystem.cs
new file mode 100644
index 00000000000000..06469f257fc1fa
--- /dev/null
+++ b/Content.Server/SS220/AutoEngrave/AutoEngravingSystem.cs
@@ -0,0 +1,21 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Shared.Examine;
+
+namespace Content.Server.SS220.AutoEngrave;
+
+public sealed class AutoEngravingSystem : EntitySystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<AutoEngravingComponent, ExaminedEvent>(OnExamine);
+    }
+
+    private void OnExamine(EntityUid uid, AutoEngravingComponent component, ExaminedEvent args)
+    {
+        if (component.AutoEngraveLocKey is null)
+            return;
+
+        args.PushMarkup(Loc.GetString(component.AutoEngraveLocKey, ("engraved", component.EngravedText)));
+    }
+}
diff --git a/Content.Server/SS220/AutoEngrave/EngraveNameOnOpenComponent.cs b/Content.Server/SS220/AutoEngrave/EngraveNameOnOpenComponent.cs
new file mode 100644
index 00000000000000..ebfa8b8421c445
--- /dev/null
+++ b/Content.Server/SS220/AutoEngrave/EngraveNameOnOpenComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.SS220.AutoEngrave;
+
+[RegisterComponent]
+public sealed class EngraveNameOnOpenComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField("activated")]
+    public bool Activated;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("autoEngraveLocKey")]
+    public string? AutoEngraveLocKey;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("toEngrave")]
+    public HashSet<string> ToEngrave = new();
+}
diff --git a/Content.Server/SS220/AutoEngrave/EngraveNameOnOpenSystem.cs b/Content.Server/SS220/AutoEngrave/EngraveNameOnOpenSystem.cs
new file mode 100644
index 00000000000000..f8959e4c9d5b20
--- /dev/null
+++ b/Content.Server/SS220/AutoEngrave/EngraveNameOnOpenSystem.cs
@@ -0,0 +1,55 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Server.Storage.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Interaction;
+
+namespace Content.Server.SS220.AutoEngrave;
+
+public sealed class EngraveNameOnOpenSystem : EntitySystem
+{
+    [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<EngraveNameOnOpenComponent, ActivateInWorldEvent>(OnActivate);
+    }
+
+    private void OnActivate(EntityUid uid, EngraveNameOnOpenComponent component, ActivateInWorldEvent args)
+    {
+        if (!TryComp<ServerStorageComponent>(uid, out var storageComp))
+            return;
+
+        var character = args.User;
+
+        if (!_accessReader.IsAllowed(character, uid))
+            return;
+
+        TryEngrave(character, storageComp, component);
+    }
+
+    private void TryEngrave(EntityUid user, ServerStorageComponent storageComp, EngraveNameOnOpenComponent engraveComp)
+    {
+        if (engraveComp.Activated)
+            return;
+
+        if (storageComp.StoredEntities is null)
+            return;
+
+        foreach (var item in storageComp.StoredEntities)
+        {
+            var id = MetaData(item).EntityPrototype?.ID;
+            if (id is null)
+                continue;
+
+            if (!engraveComp.ToEngrave.Contains(id))
+                continue;
+
+            var engraving = AddComp<AutoEngravingComponent>(item);
+            engraving.AutoEngraveLocKey = engraveComp.AutoEngraveLocKey;
+            engraving.EngravedText = MetaData(user).EntityName;
+
+            engraveComp.Activated = true;
+        }
+    }
+}
diff --git a/Resources/Locale/ru-RU/ss220/auto-engravings.ftl b/Resources/Locale/ru-RU/ss220/auto-engravings.ftl
new file mode 100644
index 00000000000000..89582f1bd7a240
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/auto-engravings.ftl
@@ -0,0 +1 @@
+mateba-name-engraving = [italic]На стволе револьвера выгравировано: "{$engraved}".[/italic]
\ No newline at end of file
diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml b/Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml
index 5f05f3a54e793c..3d75920a32e893 100644
--- a/Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml
+++ b/Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml
@@ -55,6 +55,10 @@
       map: ["enum.StorageVisualLayers.Lock"]
       shader: unshaded
   - type: Appearance
+  - type: EngraveNameOnOpen
+    autoEngraveLocKey: mateba-name-engraving
+    toEngrave:
+    - WeaponRevolverMatebaSouvenir
   - type: GenericVisualizer
     visuals:
       enum.SharedBagOpenVisuals.BagState:
@@ -69,4 +73,4 @@
           Closed: { visible: true }
   - type: EntityStorageVisuals
     stateLocked: lock-closed
-    stateUnlocked: lock-open
\ No newline at end of file
+    stateUnlocked: lock-open