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 1/8] 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 Date: Fri, 16 Jun 2023 04:26:09 +0000 Subject: [PATCH 2/8] 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 3/8] 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+*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$__$C?Deu3AM z@sH&7<=eCx4suxioT0lduPdmvQ8Zsl8XfQe^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 4/8] 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~0FnljA7zW@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;di7 z$@_}s)p%|@`hW1j(P8ueemB8$+sbn)?Eueh1M_#_?LaqIgdOMO_%(k*AtCc!f zTV=zxW21!y6*8ERy_zq?zeB_q6NC*cOmMOnih`{aTxP)yYx|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#$rCdc;1znt>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-iWsF4t0000Ai@ 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#0007hNklYnsh0Ct5lk?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&j{tVNkd6Zb zV<-6BYRXj?sGC*BNXUj0CJJv7@C%3w0W{jq>lNPGQG7zx{0P%5?^$10W%vt;-zg~u z(BJWs`>$a&ZWjh=mp@J1mO&x{D2W70S zy~Ea42fqc(SV21Y?|A$a{orI#n(i#g(TAUwg4K9386!_fBzA60lEPH a4Zv4G$t4JU$3tNN0000q4^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}9nV1r69r3foELVhRy00000a8k}}2R7~>&366z^k6;THme6Lc6w&MSbuu^t6Wx-m*;=~2-YN8 zU9&6E>YBq<`^D;Quf9-i2Flv!!e&@%HB;^OPE&WJeCbB1)t9~l$<{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$oqrSyDcXRA0s5Z|*_2%=NK?q? zf%h}|rYz8V3v{k}y*2i6`T(Supc%ym=$4`2~`%`A1cKu>9sCFTG8sVOKi?dZ$Gp-t1&aZ zUPol_2Y(z1_qo^SKA+3o=OCXC2qA=W^aK^4yJ_zghqua;^ z`_Xl+dOkG3YUn*hH#|SHd-v;b?JVP^!;cRr<*nnK3{1c=tDG z>HGJ*evfh9A^PwhWAZrz#( zz%YKPdd`*kczhG7)Zdg!1w5X{n(}ryHh%^H#A5R#5&={-$H>Sf_V0g}k&#QNYK}xA zKrA+2Q@)`gjofVYo* 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%Iax%0Nhv$}r-3i+J-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`_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$oqrSyDcXRA0s5Z|*_2%=NK?q? zf%h}|rYz8V3v{k}y*2i6`T(S)TG)oWIs~`Q4LPETt^V_-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@2qAG!)J- zPAh;yI7xKnTbzzKdhwj6?oU@f^mPY#w#YmU+b*-*m!#*;6|#Lv!Y7OLjgC^c8oNg{ z)Byn6s1>`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 zcmV+$2;}$N4z&=FF@Nt#L_t(|ob8%VY#YZFhd(A1rL1IYMMP9dQ8Z->ie$;Eq57c4 zjRFZy5d^4#^iTvakV}IcaxjpCi~1(y5(B>Z;6qU#4HrH5kOB?t77Plts1URQ+Q^oi zI2I#PWW)`qmBN3bTucwkSuH7=+$BZ#P<{Zx-PzfBGjDfh-ha;gpiP@LZQ8VH)27Y; zC$3r-y(6&&{ zcUbIKwO^}zu<3xcwKV}S^1%Y?>N1L|5>-?)UpS|e({=RmX&&EP0AOrv%$5`EIG`E( z^&Id*y$a@j^nX(U(BI$B?PV0DnU-_nCR_UAqc^rfIx>^*Y(5 zMfCA$0E#53?F-ut ztj55$2J&eqzjRUR*ZTN0lmsOf;5uA@9!!KdqFN@=p; z^3?-auei^bh~g@Z%*~>xD(QH%EUohCR-P9!I)C0^*p~g84uFyqR23K%IgC+PPDK)5 zB8omfO>rkpkAGCiC(|s2j7}k=)77I=bbCbBV(;l*j@_-Cd7cV{0r2z%g{Mn7EEysZ<aE4(A8s1vFOkn`|98vwJe`65v7pP@tD^Q z2Y=S1t^>e`zGP!gO-z#9j33H#YGRVFAFPnmb&_@pwZRK+kJ-k}mo69;^0>!8Dw3OV68@8@tIK9SeS8`=pH#iaZey!a+>X0+5c1f4 z%qMcX&hF^hvN0$X2-8(MFK)+O^aVxn+kc#KTnF3V0&o!Bg>yOy|4E8FX*|7N0?8+4 zXj*UHuf*=R02tAoobCWbK1=0!_rt%H*>5@&t|Wi|4sbB?%72;OYV!B*;9Y-+$QwhV z$Y=4cKWx~(BM0Q~-$Bzf^W6HhHBD=|6AFu;l-ajFZB5fCEPmp+Oh*pTG>zG}-+v|H zKUtQZ@SkM%?RU#6*9tUEj=+KvlB67{o_jU=FY~^}XGT*1@>QV8EeaPwT zHc*~p2UH7gjw0Z3V&59zSfj;8uz%eJdi=)RuBd8R7+jeq^BpzrV?Ob8zX))svGV-s zei8REpCkLW93bQSS~0%-W>8f1$ekb?B^z29;>vS*-H8)yb%Fi896MVFVWsuhdd-^N z3TnmncH;gvZQ8VH)22x%64Go#zf&yziVn0_*qmspzDoygmp6nVB_`; zqb@$5qdGXsoJysH+<%wLPv_8R>*d4=w$}p!BU3`| z(^od$HFk#C=_zKXryMk^F@I*Kr%XM9qN?UHoUB*q(q#f8Q%CzbY(Uh20q#zP6GMgwN$&qkta^di zciTiFk%lT$i%29=RgWN%bviK=#NDY>E21in-T>F575uMElHAR)*MHZK3uC*ynr5IC z$nvdv1TfSgox3^w#}!9O50MEnt@hKiSzUGgeGPT zdllCPwlx&74@sk5QZ8c$+g;$(k3Mu2G6$juDNzAKGhmggv=V7oYL~2b<%;pAAAM+h z406;3+#MbY8NH@v;D4yL#;YOiR@EbH#wlcU+#McAWjdY(B+1P=e40S= ziD`RxE5XzKBHmz_-K_+P$N#on2gj9_+C4D(zT6)7C88~9JbxSxg+miF!qfy=>LBvj zy1Kwh9P0yy#XcLiZy@qniaTjUKFh}K8_#6`lqjlNwGP8#-*H)v9RNn$9lLuAkgxgHzq}%{ON(aLOUI+6zFBizhlaWUP!Ma6GiB=XzC4sa$Ugla6)Ke zrmj}O2@QwBV0iw;4i7t9IsQ{pZ?qaIiFvUU^EYevzZ5FuE$tzH?lJ%X002ovPDHLk FV1g5M5;On+ delta 1856 zcmV-G2fz5W5Zn%sF@F|GL_t(|ob8)mY#c`&$3NqB_N7(M zB8g(DLRSn)iAlb8;CTX7+aPaz5{#?=A@TBU!h*Gdthk{C{S4_RsHU@bK{P@bK{P z@c92kIIr3*v-e*V&dN$ju1-GOX*;ZJ6K;M8eDyGL)+%n@1Ib00`bW`*II_Xi1{(kQ zDuKXfdHv%rv;E^f=D*Nov%$G`wQ~dZtDmVqKr@yjl8ah+8u*&7`;PNw9nmdeztUzJ zns>5!^AbK^1Al?kOZ;)_0FO2IF+cyHX@hj?gsQbFM8hEo%Ls7`NC0iBvs2TVj?44U ztK%eey=8sg`myT^5n|i67~B7KlFOH?xp;A!%a^OEd*E>Zgb2CTU(*2qUF|bSIRp#? z*MJsPFtrUSUj{(R4qzB5hv;gbaoJ60`pO2yPg^$e?SHK`0K`B2K-)0nTEE~WU>HYb z@4yp4g3h*|b3K`4a1=5Q;2J_4LCTjA;s_nV5jOdJ^qu-1;Kwj_$#nXMMXv?9`u)Sr znX>rJo0)Aj15N|b**4`$zn}wdpF0hl=4R?PzSau@z9ofd0+L7xa20^6s+SO=iNVnn z@LQ1_d4EA}tWiyifXiOnNSr;%%B?rpaG#;|n={jTIhD$E!JGjA{lk+YIr4&Bxs}%E z71k)|fa)i|LOQKR0KNf$l-ChrlW9h#u9Vj^+rHKxphjREIKNguSH-{Q0O|A-x}6JI zWxtxWOt;T~wa&}M@m-*Ca9YlG{1W)P9{n2NQ-1)Y{2-^^-<&q)SAlnB(>fE)b1_)3Ryn zW`E|Bw@D-t%yzt%DLWK=JF|Ua^eNjp-^B0tv)xxs?8-G}J9ZYm2(G4Y*Uq)Ut^S(E zH4aWoKsOZ8i%^D1QvS0}lhx+4esD!`5+i@7=5ShVDMGgmksf z=rt%?zqYm(@RwB^H3fexAtDb2AC&;=H=>U_d0YGM(s%SIY$7M$(_0Ok7~Kt^e;abj z%R@QzU0nhq(1M(NlbfmA0Qg!VIdTp-$Htm!M4*NBJowxTeOC^Mh8MJm$pw6^Pk&~W z_YSzycSSk$T{!@(MQAyh;>0K%3XXBVuclIqP|5Yz@ktESM~Bspml~zh)jnZ!z(sK= z_^31;(06K=YkkL`#Dw@908*N-p>x17{cxlfAt5&EI-j^Q;$G@Iyabk!vd|08oECQ0 zntSfGzK4g0hlhuUhsXaOuAkQp<9}%02hR0`z>1+%b~vuw*!Xq1va-zL;%=@dk^Ps!r~x#C;&_EoytCo;Fga^?ouF_R!wuEH+t_EcyP zx+QeW&bELww<{o87JnODuK{4?==2Xi#p)?5m0%0~!+SIKoEUZALXp$O^!66y44$H|FsdS&g8UXjxzo;2tPec%beR`{Wc>(z_b6%9 ufc)Bb=L%GK5wy6f4Ow3+Zc&ad4gUc{S~(dl^3MDK0000XCyd{{Tbrt$%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%Fx^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#0008oNkl7f(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)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>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<$q!BWlfX%^h1|- zeEX#(*Z)1Rw9CV4-;0!E($Oz}MlD`B_3PX{D;JzP%gUxK&i^;~N%Qeela^b&ex0Js z!Nl2=@XE|!m;8j*Z{PSHW&FDMGiJNP+KW>x9!bAr5WILLj^TT9(WTqZH%(*!0#8>z Jmvv4FO#sXZzajtt delta 1016 zcmVEX>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;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?~=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=$>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?$_*;Mg0000IKVtXxt@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$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 zcmVEX>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;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&oo-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 Date: Fri, 16 Jun 2023 06:47:05 +0000 Subject: [PATCH 5/8] 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 Date: Sat, 17 Jun 2023 21:46:42 +0300 Subject: [PATCH 6/8] 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 7/8] 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 8/8] 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-X0alyF@N+Tf7Nr{uc)M8#-UKGXe2?bgtqj8G!JM&aL6lnST|e7|+%Pszt1F5DbW- zZva4dO48sjHeez3WcptjtUk2MFS%4=YogV z*$bl<{G}OC-luNuq_aScpR*Et3YYb^Ik@*)5z$0of5?>?DuV|!ZFN6~OQEsG9gnvS;|3!9W)2>W< zcNoS^apv@{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 zpIiZJ>s&|Akg>0wMn03K)_dU?TrhrtbZWY+*=oDPQrWtiax5P zuc=R}03;Os1psuXL=F9F12Uy|m57E3TKZK65X7637^z=0ph29R#7KS0G`JIPM@2JH&BQnx%YGRCR%vld1VuhEJ0e{3!%LEN=$!CJ^g0Z@3NgD7e z7^|Ds>YoZX%>tResMi0rv?VJ*{pJCd=}zpyE7^dGk$4ox*!rLZ^@PZA51Aq@W_dSO`o0h4lmP_nSpn16D(zK|v z3ZOJbt6?x-YC8ZAgSW#I0Bi;0rPxCGkVG|P1EkmDf^^x7;CJ*tk#hlR10d3$gFJ99 z48t&t|G+PozNuKH0Q;i=0000X$F@NPrL_t(oh3!_s4Z|P|#9bzzE|F(9$vAyxn=H{`@^c?;BMU6> zIaX05PKtP7?90JnQX1$C@-AfNtNiu45$goKFzP#h-FBzxc}4v|1?I0whI2`GQx zN-pP37n4;1`<{N{%qpC@2}5uh0&+hewLsK0hytyoKVpz&VH**SHub82fVO;-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