From 00e2520811cfbd2cc72c843c8ae3a14071ab5db8 Mon Sep 17 00:00:00 2001
From: Cabbage <130223709+SomeCabbage@users.noreply.github.com>
Date: Fri, 16 Jun 2023 00:25:43 -0400
Subject: [PATCH 01/10] Robot role allotment fix (#174)

# Description
Changes the borg role identifier/quantifier in the parkstation map yaml
to Robot and MedicalRobot from Cyborg and MedicalCyborg, allowing the
jobs to properly be spawned.

:cl: SomeCabbage
- fix: Nanotrasen fixed up a typo in their paperwork, meaning robots
(cyborgs) can once again be present on station!
---
 Resources/Prototypes/Maps/parkstation.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Maps/parkstation.yml b/Resources/Prototypes/Maps/parkstation.yml
index f008ed5e30..b2357e0abc 100644
--- a/Resources/Prototypes/Maps/parkstation.yml
+++ b/Resources/Prototypes/Maps/parkstation.yml
@@ -1,4 +1,4 @@
-- type: gameMap
+- type: gameMap
   id: ParkStation
   mapName: 'ParkStation'
   mapPath: /Maps/parkstation.yml
@@ -21,7 +21,7 @@
         Boxer: [ 1, 2 ]
         Chef: [ 1, 1 ]
         Clown: [ 1, 1 ]
-        Cyborg: [ 2, 2 ]
+        Robot: [ 2, 2 ]
         Janitor: [ 2, 3 ]
         Mime: [ 1, 1 ]
         HeadOfPersonnel: [ 1, 1 ]
@@ -30,7 +30,7 @@
         ChiefMedicalOfficer: [ 1, 1 ]
         MailCarrier: [ 1, 2 ]
         MedicalDoctor: [ 3, 6 ]
-        MedicalCyborg: [ 1, 2 ]
+        MedicalRobot: [ 1, 2 ]
         Mystagogue: [ 1, 1 ]
         Epistemologist: [ 2, 5 ]
         HeadOfSecurity: [ 1, 1 ]

From 0b51a6740a3c50c84fdf0016e106757e6f7bf5b1 Mon Sep 17 00:00:00 2001
From: ParkStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 16 Jun 2023 04:26:09 +0000
Subject: [PATCH 02/10] Automatic Changelog Update (#174)

---
 Resources/Changelog/SimpleStationChangelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/SimpleStationChangelog.yml b/Resources/Changelog/SimpleStationChangelog.yml
index d0df509f67..1cfd20568d 100644
--- a/Resources/Changelog/SimpleStationChangelog.yml
+++ b/Resources/Changelog/SimpleStationChangelog.yml
@@ -1022,3 +1022,11 @@ Entries:
         nothing.
   id: 92
   time: '2023-06-09T22:12:40.0000000+00:00'
+- author: SomeCabbage
+  changes:
+    - type: fix
+      message: >-
+        Nanotrasen fixed up a typo in their paperwork, meaning robots (cyborgs)
+        can once again be present on station!
+  id: 93
+  time: '2023-06-16T04:25:43.0000000+00:00'

From 1425b7083ec42ad4978782e636b3acac1a2f72ae Mon Sep 17 00:00:00 2001
From: fragileart <60947169+Keykaps@users.noreply.github.com>
Date: Fri, 16 Jun 2023 07:32:36 +0300
Subject: [PATCH 03/10] Inhands for anomaly scanner. (#170)

# Description
Adds the inhands for anomaly scanner.

Co-authored-by: fragileart <4tearsfears@gmail.com>
---
 .../Research/anomalyscanner.rsi/inhand-left.png   | Bin 0 -> 454 bytes
 .../Research/anomalyscanner.rsi/inhand-right.png  | Bin 0 -> 471 bytes
 .../Research/anomalyscanner.rsi/meta.json         |   8 ++++++++
 3 files changed, 8 insertions(+)
 create mode 100644 Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/inhand-right.png

diff --git a/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..960d6104c18dd4189b95a35e9e30e4f02a3c7d86
GIT binary patch
literal 454
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z8$4YcLn`LH
zy|uBh*+GEyLcLu27f0q5oa`nCCl*Xx-N?eauF=ee`HSNoz9V-Pa&9KPOOyR${#f#{
z;p+GN8W*G#lwiQh(M7KB_BPSz$c<B5JKp@-G<E8>+*IS|r{75UylGToN`9Ao|Gpgy
z!>6KS71E3czFhxz{Bw4+ccJE?jm3H?G3Wc9n!ei7y1(l3hYyeUp5$#PSQ%dK^rf4X
zL0_}&k=(T>PkZ*v`TH^Nac<22eU?@K1Xpr>aQg8m=)v~e@(jPS`=1JW{A#cEyvMv}
z-Rnc&eJ{(*`uyh3jrWY6+#ZT$j4S0E>-$+V*e@Jo+QOWX%y^4&%SMK`47Va0${2EW
z9IPA6#1_apNOND{ThNQD%=JERS*$ukPkfq0^1m(G72kgTFS~Zr*6|C|GDYXOb3wPI
zJa*iQ%AM%H*KLw}f|Swz`@#$nr#jMhJJ~B|G2X7va@b|9aOUqbQ~u7VhGM-nN0uvk
l@49(+&4td6j*b^A{5Kl4Z#HGT76ptL22WQ%mvv4FO#qIA$Eg4S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ff36f955a9c627815d9790866d180ed52c20da
GIT binary patch
literal 471
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zCwjU#hE&XX
zd($wl*+GEy!u~+3`^w@6uAh)pGBhce72=%yTu85ovzYO|^4BGd-49rkBTTyf%ztt$
zZQ9NErmgG>N>H$9x%$o-t8Pt-+FUX736t^cuU&yxFP>kvVwI=f;#S2=D^h>+Oux*>
z@Zsm*!s4?c#?Blcg-)`zKTh0Kx8~cuTZVu2H(Huo)XC;|#kb}2=m%Xrx_qI3QDo`d
zRp<7FuX%psS>p-L7y3*Lp`o@lOs{siMc-cA`s@zFfxE&19v4k(*1nyRy7L8#&)bI!
z&z`-=pRhvbbY!;ARePZWGP7AOyv$E|_w4=Ef2$d`O|WX1-Tq*6BEvo2ie!?B>e$@}
z3iu4Z?f*Ne(vjm~)O9{Dp3Zd1)&35#*TXzE-ZWV<f$8n9YrboOy*>$__$C?Deu3AM
z@sH&7<=eCx4suxioT0lduPd<j{;PBb29xJ$tIsks=q-<}sQw>mvQ8Zsl8XfQe^K1r
U!Tpro4j5Amp00i_>zopr09p3TivR!s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json b/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json
index 76eff64a56..d8a2f6d4b0 100644
--- a/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json
@@ -9,6 +9,14 @@
   "states": [
     {
       "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

From 0018958beeda1f174976e9baadba3b5b07c7a42c Mon Sep 17 00:00:00 2001
From: Cabbage <130223709+SomeCabbage@users.noreply.github.com>
Date: Fri, 16 Jun 2023 02:46:38 -0400
Subject: [PATCH 04/10] Paramedsuit resprite (#171)

# Description
Resprites the Paramedic Voidsuit. Also updates the metadata of the HoP
suit sprite because the credit wasn't done right.

# Media

![image](https://github.com/Park-Station/Parkstation/assets/130223709/7db0f24b-0822-4b82-9beb-1951ae387aa0)

![image](https://github.com/Park-Station/Parkstation/assets/130223709/653e4230-af87-4498-9ccf-da02e55dc879)

# Changelog

:cl: SomeCabbage
- tweak: Resprited the paramedic voidsuit to make it look less saturated
and hard on the eyes

---------

Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com>
---
 .../paramedhelm.rsi/equipped-HELMET.png       | Bin 1097 -> 695 bytes
 .../Head/Helmets/paramedhelm.rsi/icon.png     | Bin 716 -> 405 bytes
 .../Helmets/paramedhelm.rsi/inhand-left.png   | Bin 1332 -> 339 bytes
 .../Helmets/paramedhelm.rsi/inhand-right.png  | Bin 1314 -> 337 bytes
 .../Head/Helmets/paramedhelm.rsi/meta.json    |  47 +++++++++---------
 .../paramed.rsi/equipped-OUTERCLOTHING.png    | Bin 1884 -> 2101 bytes
 .../Hardsuits/paramed.rsi/icon.png            | Bin 808 -> 698 bytes
 .../Hardsuits/paramed.rsi/inhand-left.png     | Bin 1037 -> 443 bytes
 .../Hardsuits/paramed.rsi/inhand-right.png    | Bin 1037 -> 448 bytes
 .../Hardsuits/paramed.rsi/meta.json           |  46 ++++++++---------
 .../Hardsuits/hopsuit.rsi/meta.json           |   2 +-
 11 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
index d09e0347f5010eb891e24d1a5a7fa93f344e729c..9e76db5e8aa8ff7c5c561fdee77ed98706c042e4 100644
GIT binary patch
delta 659
zcmV;E0&M-s2)6~0Fn<DZNkl<Zc%1FpF>ljA7zW@s5g65tuoEHDCKLe^naz?SA+bbE
zNDLjiuw?8URpJL!g8l_M^A}KeVCup^L81lPI3@~8E-AgLR#h_)TXr0k-U*k1_mLtc
zcJ98*ms2v_3lRO+ayo+=t82mJwaw?xwC2)LYqnDLw>Q?c>VGQ_YOJmW`#%P7hlkO%
zsx^y+YsCv`Lao^f;<e*z&}o9wfUvkf?5FM-R!Msis`UXR)?ipA0D4Whr1IwQ!yj$F
zO5K}jEW=fqOvBv404|Kw7vK;3Fsu^h4hGm(oHMWTW+(5%uu8C&R?zG9qKCD#0>di7
z$@_}s)p%|@`hW1j(P8ueemB8$+sbn)?Eueh1M_#_<b6DN@)S}Cn6?e4dIMXhhSma9
zNFfm9E@QD$h9^aIeZE-0+fEl!h%-h{r_=xdsCc{B85c5b8&U}D2!V=iD;HN~+BV9A
z9zK2lmbgCZc2K@z!qixU)(_U*`;UTnw@ur|$2YGp?0;{Nh=_=Yh=_=Yh=_<thxTE{
zzsv~y&Dz=liFih!YRyLXvOFFKlHrJWecgP5@_=aph4^vx?VAgkHKEpQ1z+~|qt{_B
zAe4DNAQYa*J9!`P20sBHkr~Kstm{nsM;~6kh@Q_hmf;Wks22;^Ivr;QVmtA?l=1-p
z5Pk#Ud4GJpSV(0CvND-Rs22-~%s_m1oR{(rxZe319YaeY-~p-3KvwQOe4NT7NFi`*
zd|wKIJ;gbd8*p+g5oQxkjwME2i3*U&3}j_8k1*<X03fj*Rmu(Me14z$k-1u~1mWVc
t+yQc;$<x+CL_|bHL_|bHL_}x!1ukGTYE%o#^b7z1002ovPDHLkV1mrSH!uJI

delta 1064
zcmV+@1lRkw1<44IFn<ICNkl<Zc%1E;?`vCC7{@=i&AR>?LaqIgdOMO_%(k*AtCc!f
zTV=zxW21!y6*8ERy_zq?zeB_q6NC*cOmMOnih`{aTxP)yYx|<ot(7$Cnrv-n7qv^e
z_V#AS7isR&25L@RD&qOTCE=duKHuj)=ibBNJ`eoQ(F(c9<A3pst><QDJ}b!Azpd|(
zy+GId#7u*avg!ubhF)QJ_fMFK1#~kZqS3F4o`h`u4F5!5Dgol>R#9@^M`QQ`08S@7
zyD=7PK8yG=Dzul!ik5_}`q>n!pSQ8c;}@ox;MXe=UcdNG&iMD|KIMhCT$Ghn7v*)x
z=v!8jCC@pm^?yh9m}6H3wKErSII5)eOY$`|%>=RfUfieaSYJ)#9PZO~#Oix7&4lEw
zN$5NKS!nk2;_4@mTC)#p^$!-B{luL8()xM70+y9TOC_mqZ^K$!$r-P2Z)0&biDf0F
z0+7--;~XyihJy!Rf?uvMo;vx&AeFT3WRP0~tptlVM}JwY?ZCA%ZJ&-*dZ}Of0cty>
z+(~0TV4Ncuj~+0-_8O2i+mF`@aw+w$Ivl+MVDH`<0)ZCB#wKWOJ;bF;liaxz2f(tv
zE!rZOt>4zRhtbi8q*5!CmR1(5pZ6L7;PuAo>8T+cUM3hE;n=ZGg255O;bnSyYVdmF
zGVY|w=zo`&hp4Eiu+Nv5hYHr0o~@RacA@JohKHYs9Y0<}G#X)Y@@CQZ0U7<q#zwAP
zo29Di9=h(@F@1$Xp-?Ck3WY+UP$(1%g+ifF{Ff={GqR?g%Bjx-2=Vofe3pKi`qKRY
zns!QX_yjnr)1r=QyH~(4&WK_+N_aee5ei+l`+pKNYok17CD6tZvPqCK_IUgv^u=ue
zO3uFz!1MR60#H_#PKaqHC|09{uJ?&-9e|kA2f*WxKLo&dbH7x1Ja0o??-Ln8_tGGl
zL>#$rCdc;1z<WhWz^i9J%6asEeD^YtzVUEvk3AvzPJ&c<e4)ul!`uMjCLhj|i!^n1
zvVW;UTV&Q(bG6z&=;!YB>nt>N&@eYZtjR~i-K%-~lv)F{jT(IBH@i>Z;l!MbtAhA_
zbjtp}=TP&uvE_?Ybr@^&3{1>Emp(%2O08kU2?ScCT*?p#v|t$NqU=Pd!q(p|#=j%)
zCt!YlSabZgODyj1z_mO^q_)ErbFEBc7=LlPx{eYIjz|R{Lohf(SJzQs1VYn9D!l;d
zhK-GwN^aj^-Wq=Tiy)*M6w>_xA>3|*a5%)RTXmakioF-ux(7IL;JzJ;+ifs77?*02
zC@9$O?zcrW8nNs0Q&Z0XkV<{GBO9U8(l-RazI}h%G3dIBp`p)Je}F=vP$(1%g&{(r
iP$(1%g+ifFY{y^bz{u-iWsF4t0000<MNUMnLSTZXcN((*

diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
index 1ef8eb37068fdcdcca603847eefc1d2c8ff25803..26efa2dee820995e85b51ff89b9036975cca5c47 100644
GIT binary patch
delta 378
zcmV-=0fqj|1(gGkB!2;OQb$4nuFf3k0003`Nkl<ZScUDCu}i~16vjV`bcjN)VurTr
z;ACefaToss2gk1BR)qcmg1EUm`ag(^li=d4ON(fZ3=zEy&CtO(gcn{S=3b~<?>Ai@
z-@EU-cYy;O4#%RiR7ZSpcAiRfcNZh^z9Jzve*gFa0O)vH(0}w=D*%Aa^>(cw%aQ<9
z#zeW!gUl76KNzOmU>1K?>NN|{9}Lsy>&wb1G$bh>$AQS4YpBPDbpkq`=9|9VT!}W_
zIzG*M|04j$_x(C@5uz(-w$=auQ50FVq@f-g)(Px3W_bE;0?0;dy9OFR_1@1LAk+cS
z+0MU@PDWV`KyzXY0KiiU0MO}e{O+|Nx&mUay_&Ddyu9Wb38J5{8&2@*DTF#Gn9<1-
zV~`kwu`yZAQ|N{hQ2_A-$|v)b%8e<=U)m}}Z^6#~Vc`+tQz(bxygc02dh8qyhhs7M
Y0cN^-tAfr`VgLXD07*qoM6N<$f{YZgz5oCK

delta 692
zcmV;l0!#gs1Iz`GB!3BTNLh0L01m_e01m_fl`9S#0007hNkl<Zc%1E)&ubGw6vw}t
zG_*#Mq}GJAS==VUmR!7)9(u4+5f2u$P`oH!iid*!2|atzi;%kr3O#!8XC+`gih_;Q
z($p-WX-Eo{pytQ^n9Vvfu_5(GGRB}(@?dz`nfKoJvu|g1(|?11Y+ZmZKo?;D0))et
z?Z)d=>Ynsh0Ct5lk?YW(jziaV96rB-FkrU>A`Fmuc$^C;x30k9>;+R{;)Y@H^-bj}
zs+Nw-?N>Zbo=ysZ2mvth0q+55x(Umyz_)&r&kqmR){lIP%Z0Atkh=$cy)K?30?`tH
zwR~c}h{W9_qJNi$5I_u(=@}4HhvfJ!{Yi|+yuY8t#C(+Ij@zvsNmBq>zF@1~lL&4<
zhIiox7ayIu2(4VAs}k(0wI^OVdk*Pmk9e$%J7Br8T(mQp2fu`9*#XHaaUW1?;)Yg&
zMKn6&_&N0HGeA5>D<7=qHnXMxgwO({$USR26E_VFRewU779E<LM0R<(p4&D+F85pt
z(Brl39fLxjxkc#EHMBAU7g&ye=Vi-Sv190T)2j5yl|BoFn{02e9Mo>&j{tVNkd6Zb
zV<-6BYRXj?sGC*BNXUj0CJJv7@C%3w0W{jq>lNPGQG7zx{0P%5?^$10W%vt;-zg~u
z(BJ<Bp?^>Ws`>$a<rED1CY+m#BAre{Q55c%mI^plNx|I^o6B_wz@R%{(<<B(x)<0;
zCX)yTgLO|x{)bo*69U-Scq>&ZWjh=mp@J1mO&x{D<Dqw{!sqjGKRX-3;^Ha>2W70S
zy~Ea42fqc(SV21Y?|A$a{orI#<!{1GI2=x}>n(i#g(TAUwg4K9386!_fBzA60lEPH
a4Zv4G$t4JU$3tNN0000<MNUMnLSTYY>q4^t

diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
index 2cf555506bac971c092854114180b193fc9a7693..98f4cd6e0f055d6a535bf7cae11bbce0fe720498 100644
GIT binary patch
delta 313
zcmV-90mlBc3ey6RBYyw^b5ch_0Itp)=>Px$4M{{nRCt{2+P!K5K@^7JFCm3k$db-q
z2&PaB)`Fd&cmYD}C5^oVash#mYsh^_%0R#>g}9nV1r69r3foELVhRy<XGvDyr<y6w
z$ILL@IT8Q>00000a8k}}2R7~>&366z^k6;THme6Lc6w&MSbuu^t6Wx-m*;=~2-YN8
zU9&6E>YBq<`^D;Quf9-i2Flv!!e&@%HB;^OPE&WJeCbB1)t9~l<Xz6k(senMi*H%~
zo`q`DY}RYV9Y>$<{nPpW00000000000Kk#kod<}b^PmB5A43&8y+}WTZ?SsYn+5pm
zv-st!eVr>+OfuYYBuUA1MpJjBg*%93E8N$B#IMVSG`Rr)01&nxbq7oJ1e^JG00000
LNkvXXu0mjf7v7Hv

delta 1314
zcmV+-1>O470<;Q{BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm1uKX;
zWT;LSL`5963Pq?8YK2xEOfLNpnlvOSE{=k0!NHHks)LKOt`4q(Aou~|=H{g6A|?JW
zDYS_3;J6>}?mh0_0Ya_BG^=e4&~)2OCE{WxyCQ~O5k?O}=zqhY%q(M8l9KQpU-t;`
z^)AM<{LlS4y40M-fPhFm!wl0VUMHT~v<=St#1U4MRpN8vQIjr6{K$31<2TL)mj#{~
zG1I9z;s~)=Xkn#=S<%#pCyAq~rc=I<@mS@&#aSy=SmU1jh2fmOyu@{yLr7o&i;y5f
zK?NHq!A6W$oqrSyDcX<w_y=6SL@tF~8(`#^M;RJq*AM;&zq_^a6XRY|I1aSGIL^l~
z5ZVRmRmb^0cAWYN5PSx%^rpXD1ExPouQs*l5zxI2TwFIbWe>RA0s5Z|*_2%=NK?q?
zf%h}|rYz8V3v{k}y*2i6`T(S<tK<!Ea0rYPD0|K4-G3dez5RQp(ccd|Gjfsqu<&UB
z00V1DL_t(|obB5GYZG@I$MI*r7@M|E%&KXF*Dg&k&Y~OZGP*%K9SWx6uwdDK$PWtj
zr|mEBr~LtA?1v2o3L7|>upc%ym=$4`2~`%`A1cKu>9sCFTG8sVOKi?dZ$Gp-t1&aZ
zUPol_2Y(z1_qo^SKA+3o=OCXC2qA<JLI@#*5JHIm7uR}J8i^#$r}s@weOvRn)|y`p
zuhSJO$`Ny_br4^3E5+fr*m&@FbZr(z*UU`j$LDrpWxi}R`PFjt0+?63P4`EGw5eYJ
z5DLM|%VpX2W0*f=OxK%ZRXg!?ex+LSb~sj9B!7}LbzS4;*=gQ8b-bed*Ari}<HImM
zU-L6>=W^aK^4yJ_z<Bh~D)Vme(=v4mueYgc-Y&OO73sQ0HrP++(QQ0h&?>ghqua;^
z`_Xl+dOkG3Y<rT|7QTW~(b|lK2h6r7$%Y21=IwIq5ipEAu2P<0PaLCIs3;Hi#F?AP
zV}BU=>Un*hH#|SHd-v;b?JVP^!;cRr<*nnK<m@15Xv|$nG1t;ZxNyVTJ>3{1c=tDG
z>HGJ*evfh9A^Pwh<HdczieG!N=x9^R934=+-hLCHqa(o3P#0rk6Lfd);q>WAZrz#(
zz%YKPdd`*kczhG7)Zdg!1w5X{n(}ryHh%^H#A5R#5&={-$H>Sf_V0g}k&#QNYK}xA
zKrA+2Q@)`gjo<IL_BS-7Ys%Z<_<OahtH)H7Fc&U7ZtQ^r0Wz6sCMT~v_k87iTU#3!
zFV4`^bQ?tp*PItZ2qA<JLI@#*5JCtcs(WGnW_G#WuUInxV46RzsSl2?4_FV8NPp5y
zr_Wex4P3_Zl$oL78pmAAMX38bKv9mEK3_9{H8Y$I4Fa(E<!1myKX}#llzH7>fVYo*
zUUBP>etZU4>bTmHVEgUw0kE@z#L>CI_3*5<2Jue^2ptZfZt0`-&u_>E`)yB~*Zml9
zKlO+8ebb)yC(2yQYX-`ncGUeHFn=`EMKroJ(K?a#GcmK3iJ7fW9%R^GHR4%I<Nga?
z@5WE|?(HR)yMZ}Z;DP5QSk%ckb`aLCk=@*l`}$>ax%0Nhv$}r-3i+J-<jKp6OHIuI
zDR%9;LuY3cRZVl~6*za@e*Ja-769n&?RAfiHkJT(?)=MIFQ6!4hKIj<AshN2gs4yd
Y0RNP7ugD!d9smFU07*qoM6N<$g2L#IuK)l5

diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
index 8ad5054db166c3b134841690b02c72728b869406..232e4da008d22d5b17d51ca01b5f2666748a2f03 100644
GIT binary patch
delta 311
zcmV-70m%NM3ef_PBYyw^b5ch_0Itp)=>Px$3rR#lRCt{2+OcZFKmf+^uhOA(5a}pX
zC^|$Uodvf-iw_{QySTWE-~$My&(QZM9See!gVeT5E7(ZZ;NW^rN)~fADAD@=O&4;3
z?=H99CjkHe00000N9Dve;jY~^%kk@D$2$MeL@uaUZ<+DrcYpPKmAlmE^V7fEgtgMO
zrU^^en#TTBvd(TFRvDd2)tdJ->Sfmd(an8B-=lZs-IB7tr`a}A?$E{fLn>Tv{G+VL
z*{M{`JP352$>^*1ay-W$00000000000Knb|cNgMHZ6in$iuIOx8w`_<k(^~`A>0Ru
z<6y75b8gw>-7u2;sV7OA2Z1J|{-4(qS&-Ow{?wzh0001DTL9~gPx%aMkn;cl002ov
JPDHLkV1lP*mv#UE

delta 1296
zcmV+r1@HRN0-_3#BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm1uKX;
zWT;LSL`5963Pq?8YK2xEOfLNpnlvOSE{=k0!NHHks)LKOt`4q(Aou~|=H{g6A|?JW
zDYS_3;J6>}?mh0_0Ya_BG^=e4&~)2OCE{WxyCQ~O5k?O}=zqhY%q(M8l9KQpU-t;`
z^)AM<{LlS4y40M-fPhFm!wl0VUMHT~v<=St#1U4MRpN8vQIjr6{K$31<2TL)mj#{~
zG1I9z;s~)=Xkn#=S<%#pCyAq~rc=I<@mS@&#aSy=SmU1jh2fmOyu@{yLr7o&i;y5f
zK?NHq!A6W$oqrSyDcX<w_y=6SL@tF~8(`#^M;RJq*AM;&zq_^a6XRY|I1aSGIL^l~
z5ZVRmRmb^0cAWYN5PSx%^rpXD1ExPouQs*l5zxI2TwFIbWe>RA0s5Z|*_2%=NK?q?
zf%h}|rYz8V3v{k}y*2i6`T(S<tK<!Ea0rYPD0|K4-G3dez5RQp(ccd|Gjfsqu<&UB
z00UV`L_t(|obB4*Yg=U;$MN?`&$4!{2wiR3)YFk47^F;PwNeJQQ#NQT8yhU3kby#X
zwHxto*@duyyYOP-g`(gO3NF|Shqb+^bZ(L+-4eD2yCB_3*PNaBc+s7+q^H%HtmPEH
zFE}LU$$yjN^E^+ULpaX^LI@#*5JCtcgb?EYMcb+{7E7tkWs8fSZduol{!4y+bAe%;
zR*OAJf*n0nzI%iHV?Se=%NUla^7$`)-wCz(9siWSt^?FBgDP+#NpJQd0O2qkeEeFW
z|9#XKd8NHR>)TG)oWIs~`Q4LPETt^V<oByN-haOIf#(B$IR6PRy&EAI?C|AuaPr%B
znU&ai>_-pX*YtgDbS+*&*V{e$1I`o6GAV>6h@S1{(Yon5qG!7)geI^obC;X;bS%rH
z5I)0le~MSvKZa_>J?!;AS?*6!2%qufcc*}Dm(i+aLc>GYl{L>7gocMGE|szE^3J!W
z0e`k#MzcyBY5AJNhhKwVuQFFX`J_U%?AEJQe-X4ziq~f-c8w5OyX6+=4kQSz{0Lnm
zJJ*6|!Me{JM~OeY&s^m#pk}oHs%-g|y1A_D6AIwap-v_z2bi6mXK?TpE?-{Y_U#e?
zw*8Io=D(vh|IpBL%*;HXT3w^1<-oT21AnzAiA0I<@lLYYRnqBcjvpT-ot`F}U1fZ{
zlSHDlYmI4ylfSh!Lt9&$Ti)85**3ptGzSKTm0?7fntD?C#EDMw`5X%i*L^$s4kv$a
zZ!g!bEz#b77sH6`nfyWsA%qY@2qA<JLI@#tQq#AIHSLsVEgnFrulB?(=%zwy+J7m<
zk#|7v06^&-?!JO}{G2aWkvD5NU@VqWna_R$AaLO$0A9TNIRL@nMu%9IiQhL>G!)J-
zPAh;yI7xKnTbzzKdhwj6?oU@f^mPY#w#YmU+b*-*m!#*;6|#Lv!Y7OLjgC^c8oNg{
z)Byn6<Mnpuv35_vgZVp6#@aoBe}AvC4ZD7{=a*jCI5HcnvhjF{$;pAH!tI8JegXIH
zO=<cc`&9Ae5hAOz<hn-O4vDPYA|5Ys?AV*6)6>s1>`rL-0;TH{YGW@!hG;ZSHk;wb
zjqbWSd*Q!8(*eiE-c$K}&Rv7QdGmPys@3m(-*_Q}_#47)U?s95Y9{~y00{s|MNUMn
GLSTX%3y6#W

diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
index c402402b13..3b8088c39d 100644
--- a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by DSC@cababge#9633 (561159087765848084)",
+
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
index da0a69c9c4dbd45072654bb7d9e4b6dfaafc3c68..fbd2b722a66b384967994b7f49e89f21407b1a95 100644
GIT binary patch
delta 2075
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
FV1g5M5;On+

delta 1856
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

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
index 5a1e8bf19485767bd80c3cccc213507c5d8c427b..d319d80e32d92ce76d73378ec27583b55dca234f 100644
GIT binary patch
delta 674
zcmV;T0$u&62D$~1B!2;OQb$4nuFf3k0007XNkl<ZScUDC&rcIU6vsbn3^5~tp`lGS
zw3T1MVv8oofr~LD>XCyd{{T<iHFE2bgqsKc0~1c(jo!Qv4<rf=)s(Qd(8jE(LxLNT
z!+L0EWG(D25D&(Flb7AR{l53Uvv1xEbkW8C4l9a~NF>brt$%wDeSpT^E{>3tm!Fw$
zxhG2udkT9f4Z!<1FHP=dvw3j=<#O2v7+)wNx7HC-;s|MY!=A!Z3N<-RWu@2>mCIRC
z0xm@f0Pt=<@Bxy^B$bt-DL#_T7;}U~NJ(X-NHUoW#DyW20BEh;bzNrW=CN{9jAS!p
z1_z8)Up&XkO@A>nH;?POj4u>p<&A8?mHUtUp8i%F<kmV@XYT-z85}U2S4)ckxUS3H
z#bv&)y+ut<1MqXd$&c5or`C!510&fC0Ct~1$lpD$ef?(a#^a}^IDn86yH5n-Ps8OX
z0e*P{`+9-TwOz#4JIfQ&*GYG(HN(@zcd9kRyOv4gmwz`dCcsk)@o|%sQXI5>x^SxQ
z7~akwajCk4)t-zn#G3-85K_`>Pxt^m{RvWa2O*`gRNX=Em0o+o7g9zRhZuhV+C3dg
z)1bZTy2Dt$5F`zy*)FYj@S{Y;5&*5!PbVA87ijG5c5ue>1-46@cuLWTnK!Zp)zX^f
zsa7wmrGGU`i>ceAXuqcvb$ir^Iv#V-_!K$ne+`L5B5;?SgwPh~V7;jTv#OJP5Pt5T
zS%6N~YX>(|v)SzMofon10zGc0`OdoX*aEWo+0dERXGAtX>z_wNr~qC3c(J2H4}haX
zFCa>bIIDorJ#cjBvH!&j_!^ZDmVVmfH+`Uk(;Gz>UHnt{1$pKn=oC1KUjP6A07*qo
IM6N<$f|@r&EdT%j

delta 785
zcmV+s1Md8~1*is)B!3BTNLh0L01m_e01m_fl`9S#0008oNkl<Zc%1E3O=uHA6#lj;
z#BD>7f(PxPh`m@5#8yias9>N6QHv7dp$EyOA|8u}dMUk_gNS(W&|Zp%A_Nh{QbCA6
zhoq!vYz-EbcnB&K3sIYGw!wz+&CG7PwI#br8$`&1&CGoB_J4ifyf=B<h<|K#0d)cY
zlYn8id3{@Pwzn$+ECk070csl%!v^N-1N3h|^0UR?nTQH9a9R$@$0WicgcA$$c>)Iv
z-{+2_+6ovMJj23MIVj3+FjgSMPh?TK$%POxW8<_Rp@l}Ho7Oqwy&2mqILg4ab02W;
ziMi@Bo;O6kpMS`%3Y4)Rkzb)v`U4&(q00+!xkl*}C&5n^^54R$t|JmRMR5CRkdBKn
z=#8OSRY~l1A;9H2!HUJPvRNoAU_CKSztdPNtV8uJP@v09Q923J#Yusz@M~ze3yw$P
zyhQgEJ$94ram&z3_YN}9*mD-eqRaqrNnnhv5?Qn1k$)@sa@;i4cLOp5a}cGfR)Ezy
zBJ(UAyhF23#_8Sk{4&Vj{^j@4X;^0hhGxB(`%$2qy^NI=4f%W?lTrQ`kf#p$-=nFi
z2`w!iJoR{l|3vS*oeMbl-~u}L?G@yjrXf6axU?7WJ}b>9qy43M$AAW&`13E0U~#z(
z>EKxP0)NuMV+tsxr8$O-?$?fo@qUYED?ORgJG=~wn)yz7vn_!&$jIPVQ3BZ$+AUrg
z@!#hq2v0d9b}YbZW(h+6SCsY*JmgQ3s8hyjrjn4=e2!bi1q^s+sSGJ4;62JFqrH%2
z$W|P!A_466OKL0^A@2Z3QZ)9$EQj2$p#Y`3i+@NSiO$GP^-)iZC1{oa?|gjUuJP<h
z0KbHi#Iywx(X(lvU&37%z(1}0_Af1cr`mrJwU<~Q%jc8G=>>sRO72j=Fxwiqe;X`?
zYRpE!Fn#?Fh#6yR2A0KEEQ4yzMnH~8wtiT)!)hd8!f{8dk$~D;UBDj$8X)jK&JAq<
P015yANkvXXu0mjfeJgTe

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
index 1a4f03fa5d11ccd5ab45640ff423052937c89cc3..d20518c462876d9b00fbb087f5cc4f0b8b7a7ab0 100644
GIT binary patch
delta 418
zcmeC>*v&jaxt@WsILO_JVcj{ImkbPyrJgR1Ar*7p-rDbVI6#E$!}=f}&-NDUEf<_-
zA9d8?+7+T9%T@aN!L*Y{(?85C5mRRupT4hQa>CLkr<NIBy`fCU9XbCwUbyF-{PDMM
z`c8RsMfKB`41zH5SKTt$(MwZBHh!MFB16K(z!UT9Wu6=|xN_=><$q!BWlfX%^h1|-
zeEX#(*Z)1Rw9CV4-;0!E($Oz}MlD`B_3PX{D;JzP%gUxK&i^;~N<W`qh)qRdOLec0
zexE_c*CjRO*{^2BOH?y51nk<^@^)8d@Ajzn;?lm(vQs=7OBIxYUi<<gC8b4Ej3#An
ztxDQjRll3Ho?*ehO`Vr^-)ebvN$S)zUIqy%&p#(__zO7v`dPoO^og$Y<ieJd7DkiY
zU66oDyNk=T^6y*PmK`&5*%Xj%qPn7D{o)FS!<+xDpMU&CLCLk8>%Qeela^b&ex0Js
z!Nl2=@XE|!m;8j*Z{PSHW&FDMGiJNP+KW>x9!bAr5WILLj^TT9(WTqZH%(*!0#8>z
Jmvv4FO#sXZzajtt

delta 1016
zcmV<U0|)%O1C0ofBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ%j3f9oj*}
zAwzYtAS&XhRVYG*P%E_RU~>J0CJjl7i=*ILaPVWX>fqw6tAnc`2!4RLxj8AiNQwVT
z3N2zhIPS;0dyl(!fY7Wm)$ADuRLwHd$%L5At%|`{gb_hMLVpOz%+%*3DFx5*bq^n3
z@8Uem``n+SFJCYj;1h{wnQmCb8^qI_md<&fILgX$p7@-2%%BSrKXP4h`HgeQVS#5x
zjZAu;I7%#*x>)IARyI`PDdJdO)hJ)cx}4{{#aXS^S^J*+h2es>vdndw!$@KgOOPN!
zK^+xTVIfYdMt_QlH0>um{6mgkB9}t03K%&SP=gBD@q_=t?{3ZF<b<0PP5^-y+x{2<
zg1bPgVcXxww%s}b{LjFZ*74Vxz|1G<jgA&O0tU8$i|dZ2>;acMz~GZE8?qz$X$r+6
z@P0<$lmjBSK<}E{TYDd;4?u>xO5Felhrnowve!M{9e?WX?cX!){(b=d19EuqpJ*!p
z00KlwL_t(|obB1MYZGA{#_?}@j-6W2p^zXt2`-WbEQrubw+@w(rHdkF>3CCJM6e(Q
z@h=c@vV`K+p@o!A6{H5C;O5XkC!tG%gK)eK?<Gy4m*$e+orBK@4&Hl{``vplZ!X6@
zAR;0nB7Y(xA|fLHlY(8T&~fh;G=KWtUi)pTa|FRl7eyUl9_UakzNgjNGaTnd6IO)^
zg$K}_2HJjWPW!%;qUa7#0XhW153AuNGMa!L_hkMx(CF)H;QMx5x>~=12J5RI0XRLq
zZ!^RMW-H*^uRlPkucyTI^1=v}P5{{4nk9-V7Jow<$ZP^8-h5_lX}7n(wzSLc!{@2%
ztgn6rO5FUk48Y9H7poy==XU*jyv%D3!g#B>i=U+tI@oaj*l>j7|C#QE*Tx)p=$<Z=
zbGi6yw&kYq{{r3iXxz~Oh4N$I%wkXjncV}tlZ19UFW%iCkBbNE2cb))dl2fcwKBKI
z_J84VW)DGN`V(kh{gt7dPvrLDB5-U}_i`o^P_Ne^aWy^awW`%>>N-~(A|fIpA|fIp
zA|mOSy>TrT7hS9M444G=34%$Y=vAg~bS)xz(_FyE*&Uz~$K2Vnh~&*Cpc`ZRSi6Cb
zxwB*w$(yc#D5|izH5>1Zo(v7kB9b?ofN^e&?PKjy9CK&ODv~!6#&PyWE~&14ByS?W
zSiAq6<3#et=`eg~EaQ$2tji8CmCzoJ`2@gO9B=1kyhz^kL1ks`uJeg5j24ThHGU*-
mx&qEG9`d;lv=cUwVf_XCRMK?$_*;Mg0000<MNUMnLSTa6p7jp^

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
index 7cbe13739171cfcba05ac111c0696b1d44f13b51..e8f640581eeb21cfb4b4a1b0cab8bed3cbcdaecd 100644
GIT binary patch
delta 423
zcmeC>IKVtXxt@WsILO_JVcj{ImkbPyRh}-6Ar*7p-m>>T>>$DRVR=waX8RFl(WuPL
z79OsSGFl=BosL_je>eUyvqVgtU0mG0X|gEmQI3yVhGCq0__8vWs%%x=T0igpmqW5A
zCqL0UUCkf}17|0>+*lCA<#=^k|1xfd8RjCBo*(C|zh3Gt<fqxX<Grc4nM6qLN$JQp
zdASeXzTv1;?p~1Py{6NO=hKJQpq+E|W4q7I;*maM8?*SL$;Yb7#z!wX=geU}eZAsm
z@tTWTQ%-%_v4P|C^&MR^q<=9nB)t5`CV4sM`j2(TLr-63U^smFK$q#Aqf>$e1U;|k
z0Fj_zpcn6aqk6ZMUa>(_tL{fChdUJ3vU|&Z-4R_^$Hed?-2C?}`Cq~;7vlcye_eR>
zlS$M(H>0UP-)p!a0TbJ6e0;7hZe?)_d=t-JjH}~QG|79fwkT0bZIk6K?+@>klV`=I
zv#0evws>T5&PBgI;eaj!!|m$d!5_b}-(ortt{{K!`mWajLV|+6GyLn#3m+Q@q%<=C
Nfv2mV%Q~loCIHaUwc!8&

delta 1016
zcmV<U0|)%T1C0ofBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ%j3f9oj*}
zAwzYtAS&XhRVYG*P%E_RU~>J0CJjl7i=*ILaPVWX>fqw6tAnc`2!4RLxj8AiNQwVT
z3N2zhIPS;0dyl(!fY7Wm)$ADuRLwHd$%L5At%|`{gb_hMLVpOz%+%*3DFx5*bq^n3
z@8Uem``n+SFJCYj;1h{wnQmCb8^qI_md<&fILgX$p7@-2%%BSrKXP4h`HgeQVS#5x
zjZAu;I7%#*x>)IARyI`PDdJdO)hJ)cx}4{{#aXS^S^J*+h2es>vdndw!$@KgOOPN!
zK^+xTVIfYdMt_QlH0>um{6mgkB9}t03K%&SP=gBD@q_=t?{3ZF<b<0PP5^-y+x{2<
zg1bPgVcXxww%s}b{LjFZ*74Vxz|1G<jgA&O0tU8$i|dZ2>;acMz~GZE8?qz$X$r+6
z@P0<$lmjBSK<}E{TYDd;4?u>xO5Felhrnowve!M{9e?WX?cX!){(b=d19EuqpJ*!p
z00KlwL_t(|obB1aYZGA{$MJVO$GWtjLm@$Q(Wz(}QLsY`ZXFcq(nS%nbiAouM6d`2
z@h@<25X%j2=}<^lLE7NdsSXWv60$UO5FWk`&&B?F?%Etr?mYay;Nb4bJ(uTs^4yc-
zKA@CRN`EP(lu}A5rIh-gREloEs8p*@q}zQ3i~(B&!5GH8IoIE-?&_g%?-q1^+QYy5
z?@KjcL9mN4cYy}RxX-!bDy&o<LuUdwv|DGwmX*lC!9xI+7e4`Q;K+HNV*pz6V)kuZ
zX`qcQYl-J}j+8MC*4C%vqkZQ&&Ka=t>o-t4QGZh7dVS7s>qcyH@*4m*zdQwMEH8e)
zY}J-bZS2X?{ER?Tpeal9GcvWYC*_&}q1=vs2&@W(mv6VN1h(^Gyfx+YXJrw}%ei{$
z0Hmzyq1Z(b;2LH72e3kcab)`|mHLje{mwPO8c*0Sn;t74ZX|x1G64Gt`{nWc(Ix=z
zK7ZdyJSSmVC*3n;yA96v<9z!Qo&*ow#U&F(4^DM>VWFs&D5aEAN-3q3Qc5ZH&nU%9
z&LDU##`J+%pii~>k#2X>OWPA(il)gwI=2xwK%XGk^?L1;T)?fE===z1$5Hoj^zFlt
z15i|SZiAV%^=XW0c)jw_GoXm*+(z5AIC1Jej=l>}WON=1tj3Y|5OKFp#YX2BN8MRu
zT)Fd)&Sm?)RO-)wp4aaidJVAhkIrqx-Sd9kj02E=bUui<2a&fg8KzPZ(fP$OcUBpm
m1oMr~qbPziKa|GY9{mAXnbuT~1Aq7c0000<MNUMnLSTY{2l{#d

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
index 2818392b32..56988d7cd0 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json
index 919becffc8..5fd3074da9 100644
--- a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json
+++ b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by Cabbage#9633",
+    "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)",
     "size": {
         "x": 32,
         "y": 32

From 9b53c491134a43e975baaba8f1a2223598209e6b Mon Sep 17 00:00:00 2001
From: ParkStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:47:05 +0000
Subject: [PATCH 05/10] Automatic Changelog Update (#171)

---
 Resources/Changelog/SimpleStationChangelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/SimpleStationChangelog.yml b/Resources/Changelog/SimpleStationChangelog.yml
index 1cfd20568d..02d4eeef88 100644
--- a/Resources/Changelog/SimpleStationChangelog.yml
+++ b/Resources/Changelog/SimpleStationChangelog.yml
@@ -1030,3 +1030,11 @@ Entries:
         can once again be present on station!
   id: 93
   time: '2023-06-16T04:25:43.0000000+00:00'
+- author: SomeCabbage
+  changes:
+    - type: tweak
+      message: >-
+        Resprited the paramedic voidsuit to make it look less saturated and hard
+        on the eyes
+  id: 94
+  time: '2023-06-16T06:46:39.0000000+00:00'

From 0e78e369c267b6f35457ad58f10b63db45c8e4dc Mon Sep 17 00:00:00 2001
From: router <messagebus@vk.com>
Date: Sat, 17 Jun 2023 21:46:42 +0300
Subject: [PATCH 06/10] Fix missing AI eye copyright attribution (#177)

# Description
See title.
The original .rsi apparently didn't have any, as I was using them
locally on Corvax. Whoops!

# Changelog
no changelog no fun
---
 .../Textures/SimpleStation14/Mobs/Silicon/ai.rsi/meta.json      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/SimpleStation14/Mobs/Silicon/ai.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Silicon/ai.rsi/meta.json
index cb4497f9f5..60ab262298 100644
--- a/Resources/Textures/SimpleStation14/Mobs/Silicon/ai.rsi/meta.json
+++ b/Resources/Textures/SimpleStation14/Mobs/Silicon/ai.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Yogstation at commit  https://github.com/yogstation13/Yogstation/commit/a0362cb3d1276c4b275426c58d2da34e2d103021",
+  "copyright": "Taken from Yogstation at commit https://github.com/yogstation13/Yogstation/commit/a0362cb3d1276c4b275426c58d2da34e2d103021 / aieye: BasedUser",
   "size": {"x": 32, "y": 32},
   "states": [
     {

From dee9b706c598aa1274c1de0ec38c91221161d2be Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Date: Sat, 17 Jun 2023 22:16:24 -0700
Subject: [PATCH 07/10] fix changelogs

---
 .../Changelog/SimpleStationChangelog.yml      | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/Resources/Changelog/SimpleStationChangelog.yml b/Resources/Changelog/SimpleStationChangelog.yml
index 02d4eeef88..f855c551b8 100644
--- a/Resources/Changelog/SimpleStationChangelog.yml
+++ b/Resources/Changelog/SimpleStationChangelog.yml
@@ -766,49 +766,49 @@ Entries:
         Added a new examine verb to open a UI showing an 6x scale sprite view of
         any humanoid.
   id: 60
-  time: '2023-04-02T00:57:38Z'
+  time: '2023-04-02T00:57:38.0000000+00:00'
 - author: Pspritechologist
   changes:
     - message: Several minor additions and tweaks to ParkStation.
       type: Tweak
   id: 61
-  time: '2023-04-03T05:31:40Z'
+  time: '2023-04-03T05:31:40.0000000+00:00'
 - author: BlitzGunner225
   changes:
     - type: tweak
       message: Changed Syndicate reinforcement radio cost from 12TC to 13TC
   id: 62
-  time: '2023-04-07T00:04:42Z'
+  time: '2023-04-07T00:04:42.0000000+00:00'
 - author: Pixel
   changes:
     - type: add
       message: Added node scanner to loadout
   id: 63
-  time: '2023-04-07T00:25:51Z'
+  time: '2023-04-07T00:25:51.0000000+00:00'
 - author: Pspritechologist
   changes:
     - message: Recovered Walter from his own ashes.
       type: Tweak
   id: 64
-  time: '2023-04-07T18:26:04Z'
+  time: '2023-04-07T18:26:04.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: Fixed cloning not applying traits.
   id: 65
-  time: '2023-04-09T03:42:37Z'
+  time: '2023-04-09T03:42:37.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: add
       message: Added pickup/drop/throw sounds to tons of items
   id: 66
-  time: '2023-04-09T05:28:16Z'
+  time: '2023-04-09T05:28:16.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: Changes to the lists of controlled substances and items
   id: 67
-  time: '2023-04-09T06:32:50Z'
+  time: '2023-04-09T06:32:50.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: add
@@ -816,19 +816,19 @@ Entries:
     - type: add
       message: Added 3 new announcer voices.
   id: 68
-  time: '2023-04-09T06:50:03Z'
+  time: '2023-04-09T06:50:03.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: Changed some trait point costs.
   id: 69
-  time: '2023-04-09T06:50:51Z'
+  time: '2023-04-09T06:50:51.0000000+00:00'
 - author: Cabbage
   changes:
     - type: add
       message: Added head of personnel's plated hardsuit.
   id: 70
-  time: '2023-04-22T22:53:43Z'
+  time: '2023-04-22T22:53:43.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
@@ -842,13 +842,13 @@ Entries:
     - type: tweak
       message: Fugitives send a command report announcement
   id: 71
-  time: '2023-04-23T13:57:10Z'
+  time: '2023-04-23T13:57:10.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: tweak
       message: HoP's hardsuit helmet now looks more like the hat and less boring
   id: 72
-  time: '2023-04-28T10:06:30Z'
+  time: '2023-04-28T10:06:30.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
@@ -856,13 +856,13 @@ Entries:
         The chemists have suddenly decided to greatly improve the look of their
         pills, making patients much happier to ingest them.
   id: 73
-  time: '2023-04-30T02:23:55Z'
+  time: '2023-04-30T02:23:55.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: Airlocks now check your belt slot for accesses
   id: 74
-  time: '2023-05-01T04:08:37Z'
+  time: '2023-05-01T04:08:37.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
@@ -874,7 +874,7 @@ Entries:
     - type: fix
       message: SAI no longer has a body :) -Psprite
   id: 75
-  time: '2023-05-01T04:13:49Z'
+  time: '2023-05-01T04:13:49.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: tweak
@@ -885,25 +885,25 @@ Entries:
         up. AI core now has telecom servers. Salvage now has 3 pre-placed GPSs.
         HoP locker is better now and contains cool stuff.
   id: 76
-  time: '2023-05-03T14:41:38Z'
+  time: '2023-05-03T14:41:38.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: add
       message: Added chocolate milk, made with 5 Milk and 1 Theobromine.
   id: 77
-  time: '2023-05-06T22:47:18Z'
+  time: '2023-05-06T22:47:18.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: Station AI and CSS are now whitelisted jobs.
   id: 78
-  time: '2023-05-07T00:27:35Z'
+  time: '2023-05-07T00:27:35.0000000+00:00'
 - author: JasperStingtail
   changes:
     - type: add
       message: Added Ohio
   id: 79
-  time: '2023-05-11T17:46:12Z'
+  time: '2023-05-11T17:46:12.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
@@ -911,7 +911,7 @@ Entries:
         The spirits from beyond have decided to stop repairing catatonic beings'
         eyesight
   id: 80
-  time: '2023-05-11T18:55:51Z'
+  time: '2023-05-11T18:55:51.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: add
@@ -919,7 +919,7 @@ Entries:
         Added Shiro's Delight, a fun drink that is time consuming and somewhat
         difficult to make, but provides funny buffs. Ask Shiro for the recipe
   id: 81
-  time: '2023-05-11T19:01:57Z'
+  time: '2023-05-11T19:01:57.0000000+00:00'
 - author: JasperStingtail
   changes:
     - type: fix
@@ -943,7 +943,7 @@ Entries:
     - type: fix
       message: East and west evac have been fixed to dock properly
   id: 82
-  time: '2023-05-17T21:54:03Z'
+  time: '2023-05-17T21:54:03.0000000+00:00'
 - author: Pspritechologist
   changes:
     - type: add
@@ -953,13 +953,13 @@ Entries:
         interesting stats at the end of the shift regarding things you may have,
         or may have not done well!
   id: 83
-  time: '2023-05-19T19:04:52Z'
+  time: '2023-05-19T19:04:52.0000000+00:00'
 - author: Pspritechologist
   changes:
     - type: remove
       message: Removes Ohiostation from the map pool until further notice.
   id: 84
-  time: '2023-05-20T04:24:27Z'
+  time: '2023-05-20T04:24:27.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: add
@@ -969,19 +969,19 @@ Entries:
     - type: add
       message: Cabbages can now be cut into leaves (request by Pspritechologist)
   id: 85
-  time: '2023-05-21T05:35:18Z'
+  time: '2023-05-21T05:35:18.0000000+00:00'
 - author: Devianartaro
   changes:
     - type: add
       message: 'Added pride pins to loadout '
   id: 86
-  time: '2023-05-22T23:39:12Z'
+  time: '2023-05-22T23:39:12.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: Fixed reagents having roughly 2.5x the advertised damage effects
   id: 87
-  time: '2023-06-06T03:15:24Z'
+  time: '2023-06-06T03:15:24.0000000+00:00'
 - author: Pspritechologist
   changes:
     - type: add
@@ -989,7 +989,7 @@ Entries:
         Nanotrasen have disabled the unneeded safeties on your guns- Make sure
         you're carful with them!
   id: 88
-  time: '2023-06-06T23:02:30Z'
+  time: '2023-06-06T23:02:30.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak

From 6bd88f1539e198cd4087d49a32473f769726a28a Mon Sep 17 00:00:00 2001
From: Cabbage <130223709+SomeCabbage@users.noreply.github.com>
Date: Mon, 19 Jun 2023 01:08:55 -0400
Subject: [PATCH 08/10] Inventory fixes (#176)

# Description
Fixes the Admin Ghost inventory not working properly.
Fixes the cuffs sprite error on punpun
Makes it so that ghosts can now have hats forced onto them by aghosts.
To make sure the hats are visible, the ghost transparency has been toned
down a little.
---
 .../Entities/Mobs/Player/observer.yml           |  10 +++++++++-
 .../SimpleStation14/Entities/Mobs/NPCs/pets.yml |   5 +++++
 .../observer_inventory_template.yml             |  10 ++++++++++
 .../Mobs/Ghosts/ghost_human.rsi/animated.png    | Bin 654 -> 631 bytes
 .../Mobs/Ghosts/ghost_human.rsi/icon.png        | Bin 308 -> 299 bytes
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/SimpleStation14/InventoryTemplates/observer_inventory_template.yml

diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 9ba31eeead..cb4a294e2a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -53,7 +53,7 @@
     drawdepth: Ghosts
     sprite: Mobs/Ghosts/ghost_human.rsi
     state: animated
-    color: "#fff8"
+    color: "#ffff"
     layers:
       - state: animated
         shader: unshaded
@@ -63,3 +63,11 @@
   - type: MovementIgnoreGravity
   - type: Pullable
   - type: Speech
+  - type: UserInterface
+    interfaces:
+      - key: enum.StrippingUiKey.Key
+        type: StrippableBoundUserInterface
+  - type: Strippable
+  - type: Inventory
+    templateId: observer
+  - type: InventorySlots
diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
index 6591b441e3..3e5613d9fb 100644
--- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml
@@ -10,6 +10,11 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: monkey
       sprite: SimpleStation14/Mobs/Pets/punpun.rsi
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
   - type: Faction
     factions:
     - Pet
diff --git a/Resources/Prototypes/SimpleStation14/InventoryTemplates/observer_inventory_template.yml b/Resources/Prototypes/SimpleStation14/InventoryTemplates/observer_inventory_template.yml
new file mode 100644
index 0000000000..6737e6b709
--- /dev/null
+++ b/Resources/Prototypes/SimpleStation14/InventoryTemplates/observer_inventory_template.yml
@@ -0,0 +1,10 @@
+- type: inventoryTemplate
+  id: observer
+  slots:
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      slotGroup: MainHotbar
+      uiWindowPos: 1,0
+      strippingWindowPos: 1,0
+      displayName: Head
diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/animated.png b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/animated.png
index 4d6a068f2c41171c0fb69a020c89b8620af11fa4..dbc5e1b3c4fa5fd1a4a2eb54faeddc9ee53048ff 100644
GIT binary patch
delta 593
zcmV-X0<Qgz1@{DyF@G^hL_t(|ob6h>al<eS1=D$wG|3P?SDM7mHYwvp+&La18O9w`
zSkdtyQX~j~v@N_loeEKSPfy@a0)WA=YPi}Pz4wPHh;v^uavp@=dw=lWzXr!4f7gBT
zlQUo>yF@N+Tf7Nr{uc)M8#-UKGXe2?bgtqj8G!JM&aL6lnST|e7|+%Pszt1F5DbW-
zZva4dO48sjHeez3W<oSf(BdyLfIwa)q9=dWfC_T5h@SkEX>cptjtUk2MFS%4=YogV
z*$bl<{G}OC-luNuq_aScpR*Et3YY<f?ZW;vEHz||+NJy{3^n|e49ErjH%9v5G5_KV
zpz@QaLFe3OMt?+)X>b^Ik@*)5z$0of5?>?DuV|!ZFN6~OQEsG9gnvS;|3!9W)2>W<
zcNoS^apv@<!1|bwTBs;)h5+-ivy5{yK-z7E&5$aG!C){L3<ksMz^M<|&w@F3<jHBz
zU1h*1AoYJv)dXqonxCU70W2ZCxFx>{z6-``#wBUMkAGmSW?ZZPD!lqZP%;D5A0A+u
z?!-R4k_{*riF@G^TOZ^=tq|!p1!`&Fc7Yx9ehIKNa17W1z?nlXgflQqSp76;2J{xt
z8?^>F0QiPm-*dsSshNsOF~;5?&fTb`YEfqyKxrJT!hEi62YBeb9UcJSBp5G+6Xc5|
zia|C&dP*%Wh$efH@E`q0q%J^h01Wu|NJprJT$dnGE#9t9Kdy&WpFph^p9kptkN#eD
f84L!4;Sul$y(Xp(eh8#o00000NkvXXu0mjfv7Qh5

delta 616
zcmV-u0+;>w1daueF@H!&L_t(|ob8(JO#?9uh8@HNU4j*027V*v=m1rz`v3Mo401>e
z(-FdtmXnp{%dwr5o*$_?AyU7-x6apH01RW*xYjRv@4uHI&OOVd(_jCQA%4Vv_cTFL
zpIiZ<IAYhs1Zn*ThWJ}>J>s&|Akg>0wMn03K)_dU?TrhrtbZWY+*=oDPQrWtiax5P
zuc=R}03;Os1psuXL=F9F12Uy|m57E3TKZK65X7637^z=0ph29R#7KS0G`JIPM@2<H
zYe2;PQgHl#_QI%#er*NR_o;I`=_*ju=d1+p0yChp9qvz4t|4R8uGLR5wdhkSpcM4a
z80ni2^|L<!Rezs64LawZ3Q3HZ2B%A2Wc{oG;fRVx;!~vgDHy5Q3!#L5R6EE|M1LXH
z{~|lGWmhJ>JH&BQnx%YGRCR%vld1Vu<N2U-?m2N&(O+47Gn6Ccw!&seRl_h0!!QhE
zb#TrH%vZsjd*P+iU%T~uzzmUnxA%V5HbGju<>hEJ0e{3!%LEN=$!CJ^g0Z@3NgD7e
z7^|Ds>YoZX%>tResMi0rv?VJ*{pJCd=}zpyE7^dGk$4ox*!rLZ^@PZ<DNrj1ZWlN(
zzb^qR2aW*;0N8WHh1dhbgw;=jX29qKM$>A51Aq@W_dSO`o0h4lmP_nSpn16D(zK|v
z3ZOJbt6?x-YC8ZAgSW#I0Bi;0rPxCGkVG|P1EkmDf^^x7;CJ*tk#hlR10d3$gFJ99
z<Z}rUr^Wl7(~swKb&yi!e88=~qrcU>48t&t|G+PozNuKH0Q;i=0000<MNUMnLSTZ2
C<1Kms

diff --git a/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/icon.png b/Resources/Textures/Mobs/Ghosts/ghost_human.rsi/icon.png
index c7a633b9c64ac3b7952949dc9ec99bf8421fbbc8..73df599e83776e8f17975c382667ac24db5a3b9f 100644
GIT binary patch
delta 258
zcmV+d0sa280;>X$F@NPrL_t(oh3!_s4Z|P|#9bzzE|F(9$vAyxn=H{`@^c?;BMU6>
zIaX05PKtP7?90JnQX1$C@-AfN<w!!b#?S$ZGxH?ArM*fAtiZR}rcBKqC2l8*-?MS^
zC;<`3@XAIPx^ICC-43BBq$-dSZb>tNiu45$goKFzP#h-FBzxc}4v|1?I0whI2`GQx
zN-pP37n4;1`<{N{%qpC@2}5uh0&+hewLsK0hytyoKVpz&VH*<BGu2gyvtfRsg%frq
ze9xQ`*Bv!KD;@FZib!{KKT1WR;-U&~Mg|gP;(x!C2L>*SH<EvgkX@24`2YX_07*qo
IM6N<$f)ajhZ~y=R

delta 268
zcmV+n0rUQ=0<;2<F@Nq!L_t(oh3!_s4TCTYjH~X_6}m&;9fueHF49HVh7sIH1+t8r
z_?%FLl#>ub82fVO;-u7ZFev&VGf!(0qI)#YwW9bapQ9vT1$1$NAwuF(QT(ayqioAA
z1Qg!t9>U=*2!WX=W`2kZmVN=GfGA`tkP>c5H-U`w8zKk^7k>euI835QAW$44f!J_p
z99Je_tiF_7zISa*UIqL;{l>XfsM!gd;4}neKVP{()HR3#rKAfn$g;2viRhN{Dzvkq
z{-cExW+Qx7PH8tCEk7F*ah;0Dbab`ATFEcJqvyl$saO^?6aVXQ($R5xd;oa=hoY%@
S^#1?=002ovP6b4+LSTaAjd^|m


From 1838b0a130cf97862869af15ba5b97987932d9d3 Mon Sep 17 00:00:00 2001
From: Cabbage <130223709+SomeCabbage@users.noreply.github.com>
Date: Tue, 20 Jun 2023 06:38:17 -0400
Subject: [PATCH 09/10] map update with some upstream sync content (#169)

# Description
Added defibrillator cabinets into medbay and sec medbay.
Added fax machines for fax fanatics.
Added some paper bins for paper fanatics.
Added some durathread to HoP's room.
Replaced the armory Mosin. It's hammer time now.
Tagged the Brig Disposals
Made the EVA room button actually work.

# Changelog
:cl: SomeCabbage
- tweak: Parkstation map tweaks. Defibrilators, fax machines, paperbins,
and breaching hammer. Some other minor changes as well.

---------

Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com>
---
 Resources/Maps/parkstation.yml                | 713 ++++++++++++------
 .../Entities/Structures/Storage/paper_bin.yml |  65 +-
 2 files changed, 538 insertions(+), 240 deletions(-)

diff --git a/Resources/Maps/parkstation.yml b/Resources/Maps/parkstation.yml
index 4d0a121c5e..dde87b4017 100644
--- a/Resources/Maps/parkstation.yml
+++ b/Resources/Maps/parkstation.yml
@@ -90,7 +90,7 @@ entities:
           tiles: XwAAAF8AAABfAAAAXwAAAC4AAAMuAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAADQAAAA0AAAANAAAAF8AAABfAAAAXwAAAF8AAAAuAAAALgAAAi4AAAEuAAADLgAAAC4AAAAuAAACLgAAAl8AAABfAAAAXwAAAF8AAABeAAAAXwAAAF8AAABfAAAALgAAAC4AAAAuAAADLgAAAy4AAAIuAAABLgAAAi4AAAAuAAAALgAAAi4AAAAuAAADXgAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAC4AAAMuAAABLgAAAi4AAAAuAAACLgAAAF4AAABfAAAAXwAAADQAAAA0AAAANAAAAF8AAABQAAAAXwAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF4AAABfAAAAKQAAACkAAAApAAAAKQAAACkAAABfAAAAXwAAAF8AAABFAAAARQAAAUUAAAFFAAABRQAAA18AAABfAAAAXwAAACkAAAApAAAAKQAAACkAAAApAAAAXwAAAF8AAAA0AAAARgAAA0YAAABGAAADRgAAAEUAAAAcAAAADAAAAgwAAAIMAAADDAAAAQwAAAIMAAADDAAAA18AAABfAAAANAAAAEYAAAJGAAAARgAAAEYAAABFAAADHAAAAAwAAAAMAAADDAAAAAwAAAEMAAACDAAAAgwAAANfAAAAXwAAADQAAABFAAABRQAAAkUAAABFAAADRQAAATsAAAAMAAADDAAAAwwAAAIMAAABDAAAAQwAAAAMAAAAXwAAAF8AAAA0AAAAOwAAADsAAAA7AAAAHAAAAzsAAABfAAAADAAAAQwAAAEMAAAAIAAAACAAAAIgAAACIAAAAl8AAABfAAAANAAAAFwAAAE7AAAAXAAAAFwAAAJcAAABXwAAAF8AAABfAAAAXwAAADsAAAAcAAADHAAAAzsAAABfAAAAXwAAAF8AAABcAAABOwAAAFwAAANcAAACXAAAAl8AAAAeAAACHgAAATsAAAAXAAACFwAAARcAAAIXAAAAXwAAAF8AAABQAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAHgAAAh4AAAIcAAABFwAAAxcAAAAXAAAAVwAAAV8AAAA7AAAAOwAAAA==
         -2,0:
           ind: -2,0
-          tiles: XgAAAF4AAABfAAAAXwAAAF8AAABfAAAAHgAAAR4AAAA7AAAAFwAAARcAAAMXAAADFwAAAF8AAAA7AAAAOwAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAABfAAAAXwAAADsAAAAcAAABHAAAAjsAAABfAAAAXwAAABwAAAJcAAAAXAAAAl8AAABfAAAAXwAAAF0AAANdAAACXQAAAl8AAAAXAAACFwAAARcAAAEXAAADXwAAABcAAAMXAAADXAAAA1wAAANfAAAAXwAAAFAAAABdAAABXQAAAl0AAAEcAAABFwAAAhcAAAAXAAADFwAAAhwAAAEXAAACFwAAAFwAAAJcAAAAXwAAAF8AAABfAAAAXQAAAF0AAABdAAABXwAAAFYAAAFWAAABVgAAAVYAAABfAAAAHAAAAhwAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF0AAABdAAABXQAAAV8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAPAAAADwAAAA8AAAAOwAAADwAAAA8AAAAXwAAAF4AAABeAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAADwAAAA8AAAAPAAAABwAAAM8AAAAPAAAABwAAAIAAAAAAAAAAF8AAABfAAAANAAAADQAAABfAAAAXwAAAF8AAAA8AAAAPAAAADwAAAA7AAAAPAAAADwAAABfAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAOwAAADsAAAA7AAAAXwAAAF8AAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAANAAAADQAAAA0AAAAAAAAADsAAAA7AAAAOwAAADsAAAA7AAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAAAAAABfAAAAOwAAADsAAAA7AAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAADQAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAANAAAAF8AAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAF8AAABfAAAANAAAAA==
+          tiles: XgAAAF4AAABfAAAAXwAAAF8AAABfAAAAHgAAAR4AAAA7AAAAFwAAARcAAAMXAAADFwAAAF8AAAA7AAAAOwAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAABfAAAAXwAAADsAAAAcAAABHAAAAjsAAABfAAAAXwAAABwAAAJcAAAAXAAAAl8AAABfAAAAXwAAAF0AAANdAAACXQAAAl8AAAAXAAACFwAAASAAAAAXAAADXwAAABcAAAMXAAADXAAAA1wAAANfAAAAXwAAAFAAAABdAAABXQAAAl0AAAEcAAABFwAAAhcAAAAXAAADFwAAAhwAAAEXAAACFwAAAFwAAAJcAAAAXwAAAF8AAABfAAAAXQAAAF0AAABdAAABXwAAAFYAAAFWAAABVgAAAVYAAABfAAAAHAAAAhwAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF0AAABdAAABXQAAAV8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAPAAAADwAAAA8AAAAOwAAADwAAAA8AAAAXwAAAF4AAABeAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAADwAAAA8AAAAPAAAABwAAAM8AAAAPAAAABwAAAIAAAAAAAAAAF8AAABfAAAANAAAADQAAABfAAAAXwAAAF8AAAA8AAAAPAAAADwAAAA7AAAAPAAAADwAAABfAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAOwAAADsAAAA7AAAAXwAAAF8AAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAANAAAADQAAAA0AAAAAAAAADsAAAA7AAAAOwAAADsAAAA7AAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAAAAAABfAAAAOwAAADsAAAA7AAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAADQAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAANAAAAF8AAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAF8AAABfAAAANAAAAA==
         -1,1:
           ind: -1,1
           tiles: NAAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABfAAAANAAAADQAAAA0AAAAXwAAAF8AAABQAAAAEwAAABMAAAATAAAAXwAAAEUAAAJFAAADRQAAA1wAAANcAAADXwAAAF8AAABfAAAAXwAAAF8AAABSAAADMgAAABMAAAATAAAAEwAAAF8AAABFAAACRQAAAEUAAABcAAABXAAAA18AAABSAAABUgAAA1IAAANSAAADUgAAAzIAAAATAAAAEwAAABMAAABfAAAARQAAAEUAAAFFAAADXAAAAVwAAAJfAAAAUgAAA1IAAAFSAAADUgAAAlIAAAEyAAAAEwAAABMAAAATAAAAXwAAAEUAAABFAAADRQAAAVwAAAFcAAADXwAAAFIAAABSAAACUgAAA1IAAAFSAAACMgAAABMAAAATAAAAEwAAAF8AAABfAAAASQAAA18AAABfAAAAXwAAAF8AAABSAAACUgAAAFIAAAJSAAABUgAAATIAAABFAAACRQAAAUUAAAJFAAADRQAAAUUAAANFAAABRQAAAEUAAAFfAAAAXwAAAEkAAAJfAAAAXwAAAEwAAABMAAAARQAAAEUAAANFAAABRQAAA0UAAAJFAAACRQAAAEUAAAJFAAACRQAAA0UAAANFAAAARQAAA0UAAAFFAAAARQAAAkUAAABFAAACRQAAAkUAAABFAAACRQAAA0UAAANFAAACRQAAAUUAAANFAAABRQAAAEUAAAJFAAADRQAAAEUAAAJfAAAAXwAAAF8AAABfAAAARQAAAEUAAABFAAADRQAAAV8AAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABfAAAARQAAAkUAAABFAAACXwAAAEUAAABFAAACRQAAA18AAABfAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAXwAAAEUAAANFAAABRQAAA18AAABFAAADRQAAAkUAAAJfAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAKQAAABUAAARFAAADRQAAAUUAAANJAAAARQAAAkUAAABFAAACXwAAACkAAAApAAAAKQAAACkAAAApAAAAKQAAACkAAAAVAAAGRQAAAkUAAANFAAACXwAAAEUAAAFFAAAARQAAAiQAAAAvAAAALwAAAC8AAAAvAAAALwAAACkAAAApAAAAFQAAAw==
@@ -6538,7 +6538,8 @@ entities:
     - type: RadiationGridResistance
     - type: GasTileOverlay
     - type: Shuttle
-    - type: SpreaderGrid
+    - nextUpdate: 0
+      type: SpreaderGrid
   - uid: 798
     components:
     - type: MetaData
@@ -6788,7 +6789,7 @@ entities:
       - 9009
       - 9008
       - 6778
-      - 6777
+      - invalid
       - 6776
       - 6784
       - 9016
@@ -6809,6 +6810,7 @@ entities:
       - 3671
       - 8497
       - 15584
+      - 3471
       type: DeviceList
   - uid: 15591
     components:
@@ -8737,6 +8739,11 @@ entities:
     - pos: -11.5,10.5
       parent: 1
       type: Transform
+  - uid: 761
+    components:
+    - pos: 6.5,-33.5
+      parent: 1
+      type: Transform
   - uid: 8189
     components:
     - pos: 14.5,-39.5
@@ -8936,11 +8943,6 @@ entities:
     - pos: -15.5,-25.5
       parent: 1
       type: Transform
-  - uid: 1310
-    components:
-    - pos: 6.5,-33.5
-      parent: 1
-      type: Transform
   - uid: 1390
     components:
     - pos: -5.5,-3.5
@@ -9174,6 +9176,13 @@ entities:
     - pos: 3.5,-34.5
       parent: 1
       type: Transform
+- proto: AirlockMaintRDLocked
+  entities:
+  - uid: 1310
+    components:
+    - pos: 50.5,-34.5
+      parent: 1
+      type: Transform
 - proto: AirlockMaintRnDLocked
   entities:
   - uid: 5263
@@ -9196,11 +9205,6 @@ entities:
     - pos: 38.5,-39.5
       parent: 1
       type: Transform
-  - uid: 5368
-    components:
-    - pos: 50.5,-34.5
-      parent: 1
-      type: Transform
   - uid: 10024
     components:
     - pos: 43.5,-43.5
@@ -11500,7 +11504,7 @@ entities:
   entities:
   - uid: 3524
     components:
-    - pos: -16.443857,33.46222
+    - pos: -16.237007,33.457916
       parent: 1
       type: Transform
   - uid: 3618
@@ -11520,7 +11524,7 @@ entities:
   entities:
   - uid: 5734
     components:
-    - pos: 45.702072,2.8942413
+    - pos: 46.45655,2.5605865
       parent: 1
       type: Transform
 - proto: BlastDoor
@@ -11530,6 +11534,15 @@ entities:
     - pos: 29.5,-6.5
       parent: 1
       type: Transform
+    - inputs:
+        Open:
+        - port: On
+          uid: 4074
+        Close:
+        - port: Off
+          uid: 4074
+        Toggle: []
+      type: SignalReceiver
   - uid: 2740
     components:
     - rot: -1.5707963267948966 rad
@@ -11569,6 +11582,15 @@ entities:
     - pos: 29.5,-4.5
       parent: 1
       type: Transform
+    - inputs:
+        Open:
+        - port: On
+          uid: 4074
+        Close:
+        - port: Off
+          uid: 4074
+        Toggle: []
+      type: SignalReceiver
   - uid: 8616
     components:
     - pos: -32.5,33.5
@@ -11799,14 +11821,6 @@ entities:
     - pos: 47.390762,-33.346535
       parent: 1
       type: Transform
-- proto: BoxFolderBase
-  entities:
-  - uid: 3717
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -21.38843,22.866081
-      parent: 1
-      type: Transform
 - proto: BoxFolderBlue
   entities:
   - uid: 623
@@ -11829,7 +11843,7 @@ entities:
       type: Transform
   - uid: 3850
     components:
-    - pos: -21.209053,20.526453
+    - pos: -21.060514,20.521421
       parent: 1
       type: Transform
   - uid: 4097
@@ -11942,17 +11956,17 @@ entities:
   entities:
   - uid: 3689
     components:
-    - pos: -4.6550274,20.608461
+    - pos: -5.4544506,21.702372
       parent: 1
       type: Transform
   - uid: 3690
     components:
-    - pos: -4.5820737,20.837786
+    - pos: -4.037713,20.483734
       parent: 1
       type: Transform
   - uid: 3691
     components:
-    - pos: -4.342372,20.681429
+    - pos: -5.275117,21.379791
       parent: 1
       type: Transform
   - uid: 3973
@@ -39940,7 +39954,7 @@ entities:
       type: Transform
   - uid: 8101
     components:
-    - pos: -14.089604,-8.117112
+    - pos: -13.873526,-8.38321
       parent: 1
       type: Transform
   - uid: 14450
@@ -40436,6 +40450,7 @@ entities:
     - pos: -5.019763,-45.185005
       parent: 1
       type: Transform
+    - type: ItemCooldown
 - proto: ClothingBeltChampion
   entities:
   - uid: 4522
@@ -40695,7 +40710,7 @@ entities:
   entities:
   - uid: 3477
     components:
-    - pos: -15.024929,31.473085
+    - pos: -15.486205,31.548914
       parent: 1
       type: Transform
 - proto: ClothingHeadHatPlaguedoctor
@@ -41011,6 +41026,22 @@ entities:
     - pos: -13.277651,-19.644531
       parent: 1
       type: Transform
+- proto: ClothingNeckLawyerbadge
+  entities:
+  - uid: 2659
+    components:
+    - pos: -21.455048,20.80816
+      parent: 1
+      type: Transform
+    - nextSound: 1442.7645907
+      type: EmitSoundOnCollide
+  - uid: 3228
+    components:
+    - pos: -21.383314,20.682713
+      parent: 1
+      type: Transform
+    - nextSound: 1443.498632
+      type: EmitSoundOnCollide
 - proto: ClothingNeckStethoscope
   entities:
   - uid: 843
@@ -42549,11 +42580,6 @@ entities:
       type: Transform
 - proto: CrateScienceSecure
   entities:
-  - uid: 10421
-    components:
-    - pos: 45.5,-25.5
-      parent: 1
-      type: Transform
   - uid: 10423
     components:
     - pos: 44.5,-25.5
@@ -42675,6 +42701,34 @@ entities:
       type: Transform
     - nextAttack: 3510.3811331
       type: MeleeWeapon
+- proto: Defibrillator
+  entities:
+  - uid: 16342
+    components:
+    - pos: -3.5437756,-38.38789
+      parent: 1
+      type: Transform
+    - nextUpdate: 55.6903703
+      type: PowerCellDraw
+    - nextSound: 55.8903703
+      type: EmitSoundOnCollide
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 4075
+    components:
+    - pos: -7.5,-28.5
+      parent: 1
+      type: Transform
+  - uid: 5368
+    components:
+    - pos: -6.5,-34.5
+      parent: 1
+      type: Transform
+  - uid: 16339
+    components:
+    - pos: -21.5,5.5
+      parent: 1
+      type: Transform
 - proto: DeployableBarrier
   entities:
   - uid: 777
@@ -43581,6 +43635,24 @@ entities:
       type: Transform
 - proto: DisposalPipe
   entities:
+  - uid: 4077
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -20.5,-48.5
+      parent: 1
+      type: Transform
+  - uid: 4082
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -21.5,-48.5
+      parent: 1
+      type: Transform
+  - uid: 4397
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -19.5,-48.5
+      parent: 1
+      type: Transform
   - uid: 4423
     components:
     - rot: 3.141592653589793 rad
@@ -43826,11 +43898,6 @@ entities:
       pos: -19.5,3.5
       parent: 1
       type: Transform
-  - uid: 14833
-    components:
-    - pos: -20.5,2.5
-      parent: 1
-      type: Transform
   - uid: 14834
     components:
     - pos: -20.5,1.5
@@ -44389,11 +44456,6 @@ entities:
     - pos: -15.5,-45.5
       parent: 1
       type: Transform
-  - uid: 14973
-    components:
-    - pos: -18.5,-48.5
-      parent: 1
-      type: Transform
   - uid: 14974
     components:
     - pos: -18.5,-47.5
@@ -46595,6 +46657,25 @@ entities:
       pos: -5.5,8.5
       parent: 1
       type: Transform
+- proto: DisposalRouter
+  entities:
+  - uid: 3963
+    components:
+    - pos: -18.5,-48.5
+      parent: 1
+      type: Transform
+    - tags:
+      - perma
+      type: DisposalRouter
+- proto: DisposalTagger
+  entities:
+  - uid: 2825
+    components:
+    - pos: -20.5,2.5
+      parent: 1
+      type: Transform
+    - tag: perma
+      type: DisposalTagger
 - proto: DisposalTrunk
   entities:
   - uid: 8679
@@ -46603,6 +46684,12 @@ entities:
       pos: -18.5,-50.5
       parent: 1
       type: Transform
+  - uid: 8687
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -22.5,-48.5
+      parent: 1
+      type: Transform
   - uid: 9184
     components:
     - pos: 17.5,-44.5
@@ -47057,9 +47144,9 @@ entities:
       type: Transform
     - chance: 0.7
       type: RandomSpawner
-  - uid: 4552
+  - uid: 4375
     components:
-    - pos: 41.5,-9.5
+    - pos: 38.5,-9.5
       parent: 1
       type: Transform
   - uid: 5725
@@ -48154,6 +48241,12 @@ entities:
     - enabled: True
       type: AmbientSound
     - type: ActiveEmergencyLight
+  - uid: 4076
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 30.5,-5.5
+      parent: 1
+      type: Transform
   - uid: 4530
     components:
     - rot: 3.141592653589793 rad
@@ -48176,17 +48269,6 @@ entities:
     - enabled: True
       type: AmbientSound
     - type: ActiveEmergencyLight
-  - uid: 4533
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 37.5,-5.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: PointLight
-    - enabled: True
-      type: AmbientSound
-    - type: ActiveEmergencyLight
   - uid: 4534
     components:
     - rot: -1.5707963267948966 rad
@@ -49977,6 +50059,13 @@ entities:
       type: Transform
 - proto: FaxMachineBase
   entities:
+  - uid: 849
+    components:
+    - pos: -25.5,2.5
+      parent: 1
+      type: Transform
+    - name: Warden's Office
+      type: FaxMachine
   - uid: 3293
     components:
     - pos: -14.5,31.5
@@ -49984,6 +50073,13 @@ entities:
       type: Transform
     - name: Cargo
       type: FaxMachine
+  - uid: 3470
+    components:
+    - pos: 49.5,-32.5
+      parent: 1
+      type: Transform
+    - name: Mystagogue's Office
+      type: FaxMachine
   - uid: 3829
     components:
     - pos: -13.5,-37.5
@@ -50005,6 +50101,20 @@ entities:
       type: Transform
     - name: Head of Personnel's Office
       type: FaxMachine
+  - uid: 4376
+    components:
+    - pos: 45.5,-25.5
+      parent: 1
+      type: Transform
+    - name: Epistemics
+      type: FaxMachine
+  - uid: 4380
+    components:
+    - pos: 18.5,20.5
+      parent: 1
+      type: Transform
+    - name: Kitchen
+      type: FaxMachine
   - uid: 5493
     components:
     - pos: -24.5,-28.5
@@ -50028,11 +50138,62 @@ entities:
       type: Transform
     - name: Chief Engineer's Office
       type: FaxMachine
+  - uid: 6777
+    components:
+    - pos: -21.5,22.5
+      parent: 1
+      type: Transform
+    - name: Lawyer's Office
+      type: FaxMachine
   - uid: 16724
     components:
     - pos: -6.5,11.5
       parent: 1
       type: Transform
+    - name: Security Lobby
+      type: FaxMachine
+  - uid: 16742
+    components:
+    - pos: -14.5,-8.5
+      parent: 1
+      type: Transform
+    - name: Dorms Public Fax
+      type: FaxMachine
+  - uid: 16745
+    components:
+    - pos: 45.5,2.5
+      parent: 1
+      type: Transform
+    - name: Engineering
+      type: FaxMachine
+  - uid: 16808
+    components:
+    - pos: -11.5,13.5
+      parent: 1
+      type: Transform
+    - name: Head of Security's Office
+      type: FaxMachine
+  - uid: 16814
+    components:
+    - pos: -14.5,36.5
+      parent: 1
+      type: Transform
+    - name: Chief Service Supervisor's Office
+      type: FaxMachine
+  - uid: 16815
+    components:
+    - pos: 34.5,-31.5
+      parent: 1
+      type: Transform
+    - name: Chaplain's Office
+      type: FaxMachine
+  - uid: 16822
+    components:
+    - pos: -15.5,-22.5
+      parent: 1
+      type: Transform
+    - name: Psychologist's Office
+      type: FaxMachine
 - proto: FaxMachineCaptain
   entities:
   - uid: 3830
@@ -50647,7 +50808,7 @@ entities:
       - 9009
       - 9008
       - 6778
-      - 6777
+      - invalid
       - 6776
       - 6784
       - 9016
@@ -50668,6 +50829,7 @@ entities:
       - 3671
       - 8497
       - 15584
+      - 3471
       type: DeviceList
   - uid: 15824
     components:
@@ -50684,7 +50846,7 @@ entities:
       - 9009
       - 9008
       - 6778
-      - 6777
+      - invalid
       - 6776
       - 6784
       - 9016
@@ -50705,6 +50867,7 @@ entities:
       - 3671
       - 8497
       - 15584
+      - 3471
       type: DeviceList
   - uid: 15825
     components:
@@ -51121,7 +51284,7 @@ entities:
       - 9009
       - 9008
       - 6778
-      - 6777
+      - invalid
       - 6776
       - 6784
       - 9016
@@ -51142,6 +51305,7 @@ entities:
       - 3671
       - 8497
       - 15584
+      - 3471
       type: DeviceList
   - uid: 16256
     components:
@@ -51915,6 +52079,12 @@ entities:
       pos: -26.5,31.5
       parent: 1
       type: Transform
+  - uid: 3471
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+      type: Transform
   - uid: 3666
     components:
     - pos: -23.5,24.5
@@ -52137,12 +52307,6 @@ entities:
       pos: -0.5,-1.5
       parent: 1
       type: Transform
-  - uid: 6777
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
-      parent: 1
-      type: Transform
   - uid: 6778
     components:
     - rot: 3.141592653589793 rad
@@ -54240,12 +54404,12 @@ entities:
       type: Transform
   - uid: 3529
     components:
-    - pos: -15.357544,33.767914
+    - pos: -15.274938,33.655052
       parent: 1
       type: Transform
   - uid: 3692
     components:
-    - pos: -4.33195,21.035841
+    - pos: -4.019779,20.895922
       parent: 1
       type: Transform
 - proto: FoodCondimentBottleColdsauce
@@ -54496,7 +54660,7 @@ entities:
   entities:
   - uid: 8104
     components:
-    - pos: -13.644666,-6.5238414
+    - pos: -13.356003,-7.226358
       parent: 1
       type: Transform
 - proto: FoodDonutChaos
@@ -86607,7 +86771,7 @@ entities:
   entities:
   - uid: 16331
     components:
-    - pos: 41.270996,-9.433413
+    - pos: 41.228195,-9.431929
       parent: 1
       type: Transform
   - uid: 16338
@@ -86651,7 +86815,7 @@ entities:
   entities:
   - uid: 16278
     components:
-    - pos: 41.687866,-9.422989
+    - pos: 41.62805,-9.43261
       parent: 1
       type: Transform
   - uid: 16282
@@ -87169,6 +87333,30 @@ entities:
     - pos: 49.32872,21.671188
       parent: 1
       type: Transform
+- proto: JetpackSecurityFilled
+  entities:
+  - uid: 14833
+    components:
+    - pos: -21.295702,6.3284745
+      parent: 1
+      type: Transform
+    - lerpTarget: 182.6713645
+      type: InputMover
+    - nextAttack: 182.6713645
+      type: MeleeWeapon
+    - nextSound: 182.8713645
+      type: EmitSoundOnCollide
+  - uid: 14973
+    components:
+    - pos: -21.636438,6.346396
+      parent: 1
+      type: Transform
+    - lerpTarget: 188.5049045
+      type: InputMover
+    - nextAttack: 188.5049045
+      type: MeleeWeapon
+    - nextSound: 188.7049045
+      type: EmitSoundOnCollide
 - proto: KatanaDulled
   entities:
   - uid: 596
@@ -87246,12 +87434,7 @@ entities:
       type: Transform
 - proto: KitchenSpike
   entities:
-  - uid: 2659
-    components:
-    - pos: 8.5,26.5
-      parent: 1
-      type: Transform
-  - uid: 2722
+  - uid: 3473
     components:
     - pos: 9.5,26.5
       parent: 1
@@ -87607,9 +87790,9 @@ entities:
       type: Transform
 - proto: LockerMystagogueFilled
   entities:
-  - uid: 10168
+  - uid: 4379
     components:
-    - pos: 49.5,-32.5
+    - pos: 49.699318,-33.244587
       parent: 1
       type: Transform
 - proto: LockerSalvageSpecialistFilled
@@ -87963,6 +88146,17 @@ entities:
     - pos: 43.290405,-4.5415306
       parent: 1
       type: Transform
+- proto: MaterialDurathread1
+  entities:
+  - uid: 4395
+    components:
+    - pos: 32.27849,-17.4412
+      parent: 1
+      type: Transform
+    - count: 16
+      type: Stack
+    - nextSound: 359.1128514
+      type: EmitSoundOnCollide
 - proto: MaterialWoodPlank
   entities:
   - uid: 16279
@@ -88735,56 +88929,6 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-  - uid: 3228
-    components:
-    - pos: -15.035351,31.504358
-      parent: 1
-      type: Transform
-  - uid: 3468
-    components:
-    - pos: -15.035351,31.525206
-      parent: 1
-      type: Transform
-  - uid: 3469
-    components:
-    - pos: -15.066617,31.546053
-      parent: 1
-      type: Transform
-  - uid: 3470
-    components:
-    - pos: -15.066617,31.577326
-      parent: 1
-      type: Transform
-  - uid: 3471
-    components:
-    - pos: -15.097882,31.587751
-      parent: 1
-      type: Transform
-  - uid: 3472
-    components:
-    - pos: -15.0874605,31.587751
-      parent: 1
-      type: Transform
-  - uid: 3473
-    components:
-    - pos: -15.097882,31.587751
-      parent: 1
-      type: Transform
-  - uid: 3474
-    components:
-    - pos: -15.097882,31.598173
-      parent: 1
-      type: Transform
-  - uid: 3475
-    components:
-    - pos: -15.118726,31.598173
-      parent: 1
-      type: Transform
-  - uid: 3476
-    components:
-    - pos: -15.118726,31.629446
-      parent: 1
-      type: Transform
   - uid: 3714
     components:
     - rot: 1.5707963267948966 rad
@@ -88804,7 +88948,7 @@ entities:
       type: Transform
   - uid: 3756
     components:
-    - pos: -9.952303,-26.483715
+    - pos: -9.812768,-26.57275
       parent: 1
       type: Transform
   - uid: 3836
@@ -89092,6 +89236,99 @@ entities:
 
         pa.
       type: Paper
+  - uid: 16751
+    components:
+    - pos: 46.22213,2.7404542
+      parent: 1
+      type: Transform
+    - nextSound: 312.4973915
+      type: EmitSoundOnCollide
+  - uid: 16752
+    components:
+    - pos: 46.275887,2.6329274
+      parent: 1
+      type: Transform
+    - nextSound: 313.8618983
+      type: EmitSoundOnCollide
+  - uid: 16753
+    components:
+    - pos: 46.36547,2.5254006
+      parent: 1
+      type: Transform
+    - nextSound: 315.3304404
+      type: EmitSoundOnCollide
+  - uid: 16754
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 47.297516,-35.065475
+      parent: 1
+      type: Transform
+    - nextSound: 327.7226602
+      type: EmitSoundOnCollide
+  - uid: 16755
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 47.33335,-35.513504
+      parent: 1
+      type: Transform
+    - nextSound: 329.297954
+      type: EmitSoundOnCollide
+  - uid: 16756
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 47.207924,-35.208843
+      parent: 1
+      type: Transform
+    - nextSound: 330.831296
+      type: EmitSoundOnCollide
+  - uid: 16757
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 34.199028,-33.29309
+      parent: 1
+      type: Transform
+    - nextSound: 350.8789824
+      type: EmitSoundOnCollide
+  - uid: 16807
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 34.396126,-33.382698
+      parent: 1
+      type: Transform
+    - nextSound: 351.5431805
+      type: EmitSoundOnCollide
+- proto: PaperBin50
+  entities:
+  - uid: 2722
+    components:
+    - pos: 12.5,-35.5
+      parent: 1
+      type: Transform
+  - uid: 3468
+    components:
+    - pos: -13.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 3469
+    components:
+    - pos: -15.5,31.5
+      parent: 1
+      type: Transform
+  - uid: 3475
+    components:
+    - pos: -10.5,-26.5
+      parent: 1
+      type: Transform
+  - uid: 3476
+    components:
+    - pos: 29.5,-15.5
+      parent: 1
+      type: Transform
+  - uid: 3717
+    components:
+    - pos: 54.5,-12.5
+      parent: 1
+      type: Transform
 - proto: PaperDoor
   entities:
   - uid: 4591
@@ -89131,31 +89368,6 @@ entities:
     - pos: 34.70894,-16.341373
       parent: 1
       type: Transform
-  - uid: 4375
-    components:
-    - pos: 34.71936,-16.351797
-      parent: 1
-      type: Transform
-  - uid: 4376
-    components:
-    - pos: 34.750626,-16.372646
-      parent: 1
-      type: Transform
-  - uid: 4377
-    components:
-    - pos: 34.750626,-16.372646
-      parent: 1
-      type: Transform
-  - uid: 4379
-    components:
-    - pos: 34.750626,-16.372646
-      parent: 1
-      type: Transform
-  - uid: 4380
-    components:
-    - pos: 34.750626,-16.372646
-      parent: 1
-      type: Transform
   - uid: 4382
     components:
     - pos: 34.688095,-16.33095
@@ -89201,21 +89413,6 @@ entities:
 
         don says we gotta get something going on this station before security catches on.
       type: Paper
-  - uid: 16775
-    components:
-    - pos: 34.70894,-16.341373
-      parent: 1
-      type: Transform
-  - uid: 16777
-    components:
-    - pos: 34.70894,-16.341373
-      parent: 1
-      type: Transform
-  - uid: 16780
-    components:
-    - pos: 34.70894,-16.341373
-      parent: 1
-      type: Transform
 - proto: PaperWrittenAMEScribbles
   entities:
   - uid: 3635
@@ -89312,7 +89509,7 @@ entities:
       type: Transform
   - uid: 3748
     components:
-    - pos: -10.754785,-26.535833
+    - pos: -9.4003,-26.57275
       parent: 1
       type: Transform
   - uid: 4450
@@ -89399,7 +89596,7 @@ entities:
       type: Transform
   - uid: 10529
     components:
-    - pos: -14.797244,36.84611
+    - pos: -15.860727,35.855083
       parent: 1
       type: Transform
   - uid: 10530
@@ -89414,7 +89611,7 @@ entities:
       type: Transform
   - uid: 11871
     components:
-    - pos: -13.566536,-8.375048
+    - pos: -13.469542,-8.508657
       parent: 1
       type: Transform
 - proto: PianoInstrument
@@ -89576,7 +89773,7 @@ entities:
   entities:
   - uid: 3530
     components:
-    - pos: -16.104458,33.705368
+    - pos: -16.03991,33.601288
       parent: 1
       type: Transform
 - proto: PlasmaWindow
@@ -89889,13 +90086,6 @@ entities:
     - pos: -12.5,-23.5
       parent: 1
       type: Transform
-- proto: PosterContrabandMaskedMen
-  entities:
-  - uid: 3963
-    components:
-    - pos: -7.5,-28.5
-      parent: 1
-      type: Transform
 - proto: PosterContrabandNuclearDeviceInformational
   entities:
   - uid: 4527
@@ -92451,6 +92641,8 @@ entities:
     - pos: 12.5,-38.5
       parent: 1
       type: Transform
+    - enabled: False
+      type: AmbientSound
   - uid: 5213
     components:
     - rot: 1.5707963267948966 rad
@@ -92528,6 +92720,8 @@ entities:
     - pos: 10.5,-38.5
       parent: 1
       type: Transform
+    - enabled: False
+      type: AmbientSound
   - uid: 8110
     components:
     - rot: -1.5707963267948966 rad
@@ -94020,7 +94214,7 @@ entities:
       type: Transform
   - uid: 3532
     components:
-    - pos: -15.486949,33.82959
+    - pos: -15.494541,33.583366
       parent: 1
       type: Transform
   - uid: 3711
@@ -96679,6 +96873,17 @@ entities:
       type: MeleeWeapon
     - canCollide: False
       type: Physics
+- proto: SecBreachingHammer
+  entities:
+  - uid: 4533
+    components:
+    - pos: -22.472033,6.641972
+      parent: 1
+      type: Transform
+    - nextAttack: 101.8023304
+      type: MeleeWeapon
+    - nextSound: 102.0023304
+      type: EmitSoundOnCollide
 - proto: SecurityTechFab
   entities:
   - uid: 631
@@ -96985,22 +97190,22 @@ entities:
   entities:
   - uid: 792
     components:
-    - pos: -25.850388,2.4044106
+    - pos: -26.028803,2.4725223
       parent: 1
       type: Transform
   - uid: 800
     components:
-    - pos: -25.834763,2.5294108
+    - pos: -25.831705,2.4187589
       parent: 1
       type: Transform
   - uid: 802
     components:
-    - pos: -25.834763,2.1700356
+    - pos: -26.04672,2.2395473
       parent: 1
       type: Transform
   - uid: 803
     components:
-    - pos: -25.834763,2.2637856
+    - pos: -25.831705,2.2216258
       parent: 1
       type: Transform
 - proto: ShuttersNormal
@@ -97849,14 +98054,6 @@ entities:
       type: SignalTransmitter
     - fixtures: []
       type: Fixtures
-  - uid: 4082
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 37.725044,-5.46749
-      parent: 1
-      type: Transform
-    - fixtures: []
-      type: Fixtures
   - uid: 4163
     components:
     - rot: 1.5707963267948966 rad
@@ -98114,6 +98311,26 @@ entities:
       type: SignalTransmitter
     - fixtures: []
       type: Fixtures
+  - uid: 4074
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 38.5,-5.5
+      parent: 1
+      type: Transform
+    - outputs:
+        On:
+        - port: Open
+          uid: 1586
+        - port: Open
+          uid: 4003
+        Off:
+        - port: Close
+          uid: 1586
+        - port: Close
+          uid: 4003
+      type: SignalTransmitter
+    - fixtures: []
+      type: Fixtures
   - uid: 14734
     components:
     - rot: -1.5707963267948966 rad
@@ -98733,6 +98950,14 @@ entities:
       pos: 47.5,-28.5
       parent: 1
       type: Transform
+  - uid: 14753
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -5.5,21.5
+      parent: 1
+      type: Transform
+    - nextChargeTime: 369.6572461
+      type: SolutionRegeneration
 - proto: SMESBasic
   entities:
   - uid: 3180
@@ -99747,9 +99972,9 @@ entities:
       type: Transform
 - proto: SpawnMobMcGriff
   entities:
-  - uid: 849
+  - uid: 16811
     components:
-    - pos: -25.5,2.5
+    - pos: -24.5,4.5
       parent: 1
       type: Transform
 - proto: SpawnMobPossumMorty
@@ -101120,19 +101345,19 @@ entities:
   entities:
   - uid: 10288
     components:
-    - pos: -5.5,21.5
+    - pos: -4.5,20.5
       parent: 1
       type: Transform
 - proto: SpawnVendingMachineRestockFoodDrink
   entities:
-  - uid: 8481
+  - uid: 4403
     components:
-    - pos: -5.5,20.5
+    - pos: -19.5,-49.5
       parent: 1
       type: Transform
-  - uid: 14753
+  - uid: 8481
     components:
-    - pos: -20.5,-49.5
+    - pos: -5.5,20.5
       parent: 1
       type: Transform
   - uid: 14766
@@ -101151,7 +101376,7 @@ entities:
   entities:
   - uid: 3531
     components:
-    - pos: -15.896022,33.528164
+    - pos: -15.79545,33.688892
       parent: 1
       type: Transform
   - uid: 3683
@@ -103400,6 +103625,11 @@ entities:
     - pos: 14.5,21.5
       parent: 1
       type: Transform
+  - uid: 2652
+    components:
+    - pos: 45.5,-25.5
+      parent: 1
+      type: Transform
   - uid: 2914
     components:
     - pos: 6.5,22.5
@@ -103545,6 +103775,11 @@ entities:
     - pos: 9.5,46.5
       parent: 1
       type: Transform
+  - uid: 4377
+    components:
+    - pos: -15.5,-22.5
+      parent: 1
+      type: Transform
   - uid: 4543
     components:
     - pos: 41.5,-9.5
@@ -104210,6 +104445,11 @@ entities:
     - pos: -12.5,13.5
       parent: 1
       type: Transform
+  - uid: 3474
+    components:
+    - pos: 49.5,-32.5
+      parent: 1
+      type: Transform
   - uid: 5281
     components:
     - pos: 49.5,-35.5
@@ -104235,6 +104475,11 @@ entities:
     - pos: 47.5,-33.5
       parent: 1
       type: Transform
+  - uid: 16809
+    components:
+    - pos: -11.5,13.5
+      parent: 1
+      type: Transform
 - proto: TableReinforced
   entities:
   - uid: 249
@@ -104422,11 +104667,6 @@ entities:
     - pos: -15.5,-33.5
       parent: 1
       type: Transform
-  - uid: 4076
-    components:
-    - pos: 37.5,-5.5
-      parent: 1
-      type: Transform
   - uid: 4238
     components:
     - pos: 38.5,18.5
@@ -104527,6 +104767,11 @@ entities:
     - pos: 56.5,-14.5
       parent: 1
       type: Transform
+  - uid: 4552
+    components:
+    - pos: 18.5,20.5
+      parent: 1
+      type: Transform
   - uid: 5627
     components:
     - pos: 24.5,16.5
@@ -105028,6 +105273,11 @@ entities:
     - pos: -20.5,20.5
       parent: 1
       type: Transform
+  - uid: 2566
+    components:
+    - pos: -21.5,22.5
+      parent: 1
+      type: Transform
   - uid: 2653
     components:
     - pos: 16.5,25.5
@@ -105351,6 +105601,16 @@ entities:
     - pos: -24.5,-16.5
       parent: 1
       type: Transform
+  - uid: 16812
+    components:
+    - pos: -25.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 16816
+    components:
+    - pos: 34.5,-31.5
+      parent: 1
+      type: Transform
 - proto: TableWoodReinforced
   entities:
   - uid: 4651
@@ -106147,11 +106407,11 @@ entities:
       type: Transform
 - proto: VendingMachineChefDrobe
   entities:
-  - uid: 2652
+  - uid: 3472
     components:
     - flags: SessionSpecific
       type: MetaData
-    - pos: 18.5,20.5
+    - pos: 8.5,26.5
       parent: 1
       type: Transform
 - proto: VendingMachineChefvend
@@ -106368,15 +106628,6 @@ entities:
     - pos: -5.5,23.5
       parent: 1
       type: Transform
-- proto: VendingMachineLawDrobe
-  entities:
-  - uid: 2566
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -21.5,22.5
-      parent: 1
-      type: Transform
 - proto: VendingMachineMailDrobe
   entities:
   - uid: 3446
@@ -106653,7 +106904,7 @@ entities:
   entities:
   - uid: 3523
     components:
-    - pos: -16.45428,33.639427
+    - pos: -16.565062,33.581367
       parent: 1
       type: Transform
 - proto: WallmountTelescreen
@@ -119095,13 +119346,6 @@ entities:
     - pos: -26.64698,2.3992686
       parent: 1
       type: Transform
-- proto: WeaponSniperMosin
-  entities:
-  - uid: 761
-    components:
-    - pos: -22.470001,6.6697383
-      parent: 1
-      type: Transform
 - proto: WeaponSubMachineGunK12Compact
   entities:
   - uid: 747
@@ -119857,9 +120101,11 @@ entities:
       type: Transform
 - proto: WindowDirectional
   entities:
-  - uid: 4077
+  - uid: 4399
     components:
-    - rot: -1.5707963267948966 rad
+    - desc: "There is a note on it that reads: \"In case of emergency, break glass.\" ... There doesn't appear to be any hammer nearby."
+      type: MetaData
+    - rot: 1.5707963267948966 rad
       pos: 37.5,-5.5
       parent: 1
       type: Transform
@@ -119979,17 +120225,6 @@ entities:
       pos: -31.5,20.5
       parent: 1
       type: Transform
-  - uid: 4074
-    components:
-    - pos: 37.5,-5.5
-      parent: 1
-      type: Transform
-  - uid: 4075
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 37.5,-5.5
-      parent: 1
-      type: Transform
   - uid: 4137
     components:
     - pos: 10.5,45.5
diff --git a/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml b/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
index 0482d1dd5d..fef408dd31 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
@@ -75,4 +75,67 @@
     whitelist:
       tags:
       - Document
-      - Write
\ No newline at end of file
+      - Write
+
+- type: entity
+  parent: PaperBin
+  id: PaperBin50
+  suffix: "50, Office Paper"
+  components:
+  - type: Bin
+    maxItems: 50
+    initialContents:
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    - PaperOffice
+    whitelist:
+      tags:
+      - Document
+      - Write

From 9423f92577fbf190cd6c3fa6898dc2acb33a4585 Mon Sep 17 00:00:00 2001
From: ParkStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:38:45 +0000
Subject: [PATCH 10/10] Automatic Changelog Update (#169)

---
 Resources/Changelog/SimpleStationChangelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/SimpleStationChangelog.yml b/Resources/Changelog/SimpleStationChangelog.yml
index f855c551b8..906a72768c 100644
--- a/Resources/Changelog/SimpleStationChangelog.yml
+++ b/Resources/Changelog/SimpleStationChangelog.yml
@@ -1038,3 +1038,11 @@ Entries:
         on the eyes
   id: 94
   time: '2023-06-16T06:46:39.0000000+00:00'
+- author: SomeCabbage
+  changes:
+    - type: tweak
+      message: >-
+        Parkstation map tweaks. Defibrilators, fax machines, paperbins, and
+        breaching hammer. Some other minor changes as well.
+  id: 95
+  time: '2023-06-20T10:38:17.0000000+00:00'